Preparing for branch 1.0.1 - Merchello 1.5.0 and Umbraco 7.1.8 upgrade
Merge branch 'master' of https://github.com/BonsaiMediaGroup/Sherpa

Conflicts:
	SherpaAdventureGear/SherpaAdventureGear.v11.suo
	SherpaAdventureGear/SherpaAdventureGear/App_Data/Logs/UmbracoTraceLog.txt
	SherpaAdventureGear/SherpaAdventureGear/SherpaAdventureGear.csproj
	SherpaAdventureGear/SherpaAdventureGear/bin/SherpaAdventureGear.dll
	SherpaAdventureGear/SherpaAdventureGear/bin/SherpaAdventureGear.pdb