изменение функционала
Merge branch 'master' of https://github.com/bucketofkittens/templates

Conflicts:
	sitcenter/frontend/css/master.css
...