merge
#gt-276 work 2h
#gt-273 In Progress work 3h nearly finished
Merge remote-tracking branch 'origin/new_web_verstka' into new_web_verstka

Conflicts:
	app/assets/stylesheets/site/index.styl
some fixes
Merge remote-tracking branch 'origin/new_web_verstka' into new_web_verstka
some fixes
Merge branch 'new_web_verstka'
new fixes