Merge branch 'master' into develop

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/stylus.css.styl
	coverage/.resultset.json

#mg-62 fixed work 1h
Merge remote-tracking branch 'origin/develop' into develop