activate coupon is done
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/controllers/coupons_controller.rb