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

Conflicts:
	engines/mall/app/views/layouts/application.html.haml
	engines/mall/app/views/layouts/mall/application.html.haml
	engines/mall/app/views/layouts/shop.html.haml
Updated gemspec
Refined gems
Moved mall layout to roydon
Added requires
Fixed path helpers