Merge remote-tracking branch 'origin/V3_NEW_DESIGN'

Conflicts:
	TODO.txt
	www/application/config/database.php
	www/application/controllers/articles.php
	www/application/controllers/forum.php
	www/application/controllers/tutorials.php