set
Merge branch 'master' of https://github.com/range-web/kuper

Conflicts:
	public_html/protected/modules/admin/components/AdminController.php