commit
Merge branch 'master' of https://github.com/BonsaiMediaGroup/Sherpa

Conflicts:
	SherpaAdventureGear/SherpaAdventureGear/App_Data/Logs/UmbracoTraceLog.txt
	SherpaAdventureGear/SherpaAdventureGear/App_Data/packages/installed/installedPackages.config
	SherpaAdventureGear/SherpaAdventureGear/App_Data/umbraco.config
	SherpaAdventureGear/SherpaAdventureGear/bin/SherpaAdventureGear.dll
	SherpaAdventureGear/SherpaAdventureGear/bin/SherpaAdventureGear.pdb