#mg-67 work 4h
#mg-67 fixed
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	spec/controllers/orders_controller_spec.rb