Merge branch 'master' into friendly_url
treefc35d1867ac0bf5046fe521f9f7dcfebc5a8ee81
drwxr-xr-x - _pages
drwxr-xr-x - _res
drwxr-xr-x - adm
-rw-r--r-- 1809 config.inc.php
-rw-r--r-- 313 image.php
-rw-r--r-- 563 img2.php
-rw-r--r-- 105 index.php
-rw-r--r-- 1960 rss.php
-rw-r--r-- 784 style.php