#gt-276 work 30m
#gt-273 Fixed work 1h
#gt-276 work 30m
Merge remote-tracking branch 'origin/new_web_verstka' into new_web_verstka
#gt-276 work 2h
Dermatoglifika design page #gt-272 fixed work 2h 30m
#gt-275 fixed work 4h
#gt-274 Fixed work 5h
Merge remote-tracking branch 'origin/new_web_verstka' into new_web_verstka
#gt-276 fixed work 2h 30m
Merge branch 'new_web_verstka'

Conflicts:
	Gemfile.lock
	app/controllers/site/news_controller.rb
	app/models/site/news.rb
	app/views/site/news/index.slim
	app/views/site/news/show.slim