1229-17
Merge remote-tracking branch 'origin/master'

Conflicts:
	BuildingMaterials/Views/Home/Supply_Info_center.cshtml