add
Merge branch 'master' of github.com:DanilaGegele/flor2u

Conflicts:
	less/layout.less
	template_styles.css
	template_styles.less