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

Conflicts:
	app/assets/stylesheets/views/orders/new.styl