all
Merge branch 'master' of https://github.com/SlashDeveloper/VMTipping

Conflicts:
	VMTipping.Model/bin/Debug/VMTipping.Model.dll
	VMTipping.Model/bin/Debug/VMTipping.Model.pdb
	VMTipping.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	VMTipping.Model/obj/Debug/VMTipping.Model.csproj.FileListAbsolute.txt
	VMTipping.Model/obj/Debug/VMTipping.Model.dll
	VMTipping.Model/obj/Debug/VMTipping.Model.pdb
	VMTippingClient/VMTippingClient.v12.suo
	VMTippingClient/bin/Debug/VMTipping.Model.dll
	VMTippingClient/bin/Debug/VMTipping.Model.pdb
	VMTippingClient/bin/Debug/VMTippingClient.exe
	VMTippingClient/bin/Debug/VMTippingClient.pdb