Обновил админку
Merge branch 'master' of https://github.com/osadrum/domostroj

Conflicts:
	public_html/protected/extensions/bootstrap/assets/css/style.css