Update #1
Merge remote-tracking branch 'origin/master'

Conflicts:
	root/style.css
	root/style.less
Merge branch 'master' of https://github.com/RU-Craft/bcms

Conflicts:
	root/style.css
	root/style.less
Merge branch 'master' of https://github.com/RU-Craft/bcms