GoShopNow: Shop & Retailer pages
Merge branch 'master' of https://github.com/mrcnab/admin

Conflicts:
	themes/GoShopNow/views/site/shop.php