Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/config/main.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/config/main.php