Updating model for latest database changes
Merge branch 'master' of github.com:JamesonNetworks/CCInventoryManager

Conflicts:
	CCInventoryManager/Models/Item.cs
	CCInventoryManager/Models/MainAppModel.Designer.cs
	CCInventoryManager/Models/MainAppModel.edmx