Merge remote-tracking branch 'origin/master'
vvvvv
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/runtime/application.log
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/controllers/SiteController.php
	protected/runtime/application.log