#mg-13 In Progress work 6h
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/application.css.styl