no message
no message
Merge branch 'master' of https://github.com/paradorn/AWMS

Conflicts:
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/GeneratedArtifacts/ApplicationDataObjectContext.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/LSCodeGeneratedFiles.lsgen
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/LSResourceGeneratedFiles.lsgen
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/LSSvcGeneratedFiles.lsgen