Merge remote-tracking branch 'origin/master'

Conflicts:
	Clients/WinCE/rodas/WinCEClient.suo
	Clients/WinCE/rodas/obj/Debug/ResolveAssemblyReference.cache
	MerchServProviders/Thumbs.db
	MerchServProviders/WorldFirst/Thumbs.db
	components/xmlLoad/xmlLoad/obj/Debug/xmlLoad.dll
	components/xmlLoad/xmlLoad/obj/Debug/xmlLoad.pdb