Shops Listing
Merge branch 'master' of https://github.com/WeberStudio/MarlowApp

Conflicts:
	app/controller/DashboardC.js
	app/view/Shops.js
	marlow_admin/application/controllers/client.php