Merge branch 'master' of https://github.com/deiga/mall into extract-shop-engine

Conflicts:
	engines/mall/app/helpers/mall/application_helper.rb
Minor fix to routing
Merge branch 'master' of https://github.com/deiga/mall into extract-shop-engine
Revert "Minor fix to routing"

This reverts commit bf02845a3847615e1491274c310fa98814510c32.
Fixed controller conflict in mall
Readded required class_name
Updated gem dependencies
Updated money-rails config
Added the correct layout