Merge branch 'master' into friendly_url
tree115e78c3f27d121ba426352e9ad9b3bfcaa95c29
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-- 566 img2.php
-rw-r--r-- 68 index.php
-rw-r--r-- 1960 rss.php
-rw-r--r-- 784 style.php