Backup Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/trunk/application/logs/log-2014-08-20.php
	web/trunk/application/logs/log-2014-08-22.php
	web/trunk/application/logs/log-2014-08-24.php
	web/trunk/application/logs/log-2014-08-25.php
	web/trunk/scripts.sql