Merge branch 'master' into admin_interface_improvments
treeb1dfecce198a863ba6c2c589435684570842284e
drwxr-xr-x - _pages
drwxr-xr-x - _res
drwxr-xr-x - adm
-rw-r--r-- 1718 config.inc.php
-rw-r--r-- 312 image.php
-rw-r--r-- 555 img2.php
-rw-r--r-- 163 index.php
-rw-r--r-- 2304 rss.php
-rw-r--r-- 661 style.php