Merge branch 'active-merchant' of https://github.com/247DigitalGroup/click_lion into active-merchant

Conflicts:
	app/controllers/orders_controller.rb
Merge branch 'active-merchant' of https://github.com/247DigitalGroup/click_lion into active-merchant