qw
Merge branch 'master' of https://github.com/range-web/gkh2

Conflicts:
	public_html/protected/controllers/SiteController.php