Merge file InventoryManagerApp.Database.dbmdl
Merge branch 'master' of https://github.com/paradorn/AWMS

Conflicts:
	AOneLertInventoryApp/InventoryManagerApp.Database/InventoryManagerApp.Database.dbmdl