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

Conflicts:
	AOneLertInventoryApp/InventoryManagerApp.Database/InventoryManagerApp.Database.dbmdl
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/GeneratedArtifacts/ApplicationDataObjectContext.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.HTMLClient/ModelManifest.xml
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/ApplicationDataObjectContext.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/ModelManifest.xml