Merge branch 'master' into Discuss

Conflicts:
css/discuss.css
css/prettify-desert.css
css/slidersidebar.css
css/style.css
css/themizerindex.css
css/tryit.css
css/welcome.css
database.php
discuss.php
include/discuss-handler.php
include/discuss-success.php
include/discuss.php
include/discuss/forum_body.php
include/discuss/topic_body.php
index.php
themizer.php
tryit.php