#mg-126 In Progress work 4h30m
#mg-126 Fixed work 5h
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/application.css.sass