#mg-81 fixed work 30m
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	spec/models/order_spec.rb