Controller change
Merge branch 'Front-End-(v.5)' of https://github.com/CanviInc/CreatiShop_v.5 into Front-End-(v.5)

Conflicts:
	app/controllers/application_controller.rb