Stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	ThortonService/ThortonService/RegistryMessageBuilder.cs
	ThortonService/ThortonService/Services/PurchaseTotallerService.cs
	ThortonService/ThortonService/Services/ServiceManager.cs