Merge branches 'live' and 'dev' into dev
-rw-r--r-- 900 .htaccess
-rw-r--r-- 2605 404.php
-rw-r--r-- 469 captcha.php
-rw-r--r-- 5686 favicon.ico
drwxr-xr-x - font
drwxr-xr-x - images
drwxr-xr-x - includes
-rw-r--r-- 22586 index.php
-rw-r--r-- 413 sample.ini