styles
Merge branch 'master' into project_main_styles

Conflicts:
	css/style.less
Merge pull request #2 from vkrotkikh/project_main_styles

styles