1225-10
Merge remote-tracking branch 'origin/master'

Conflicts:
	BuildingMaterials/Models/Model1.Designer.cs
	BuildingMaterials/Models/Model1.edmx
	BuildingMaterials/Models/Model1.edmx.diagram