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

Conflicts:
	app/models/coupon.rb