Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/views/layouts/site.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/views/layouts/site.php