Merge origin/master

Conflicts:
	TODO
	js/main.js
	protected/config/db.php