Merge origin/master

Conflicts:
	protected/config/main.php
Merge origin/master