Finished paging on ShopCategory page
Merge branch 'master' of https://github.com/BonsaiMediaGroup/Sherpa

Conflicts:
	Sherpa.Facade/Controllers/PreviousPurchasesController.cs
	SherpaAdventureGear/SherpaAdventureGear/App_Data/Logs/UmbracoTraceLog.txt
	SherpaAdventureGear/SherpaAdventureGear/bin/SherpaAdventureGear.dll
	SherpaAdventureGear/SherpaAdventureGear/bin/SherpaAdventureGear.pdb
	SherpaAdventureGear/SherpaAdventureGear/scripts/ng-app/controllers/product.controller.js