Merge branch 'blah' into encadyma's-Sandbox

Conflicts:
admin.php
database.php
error/403.php
error/404.php
error/410.php
error/418.php
error/500.php
forgot.php
include/db.php
include/header.php
logoutdone.php
myaccount.php
mysettings.php
register.php
themizer.php
tryit.php