no message
Merge branch 'develop' of https://github.com/jinying0218/BuildingMaterials into develop

# Via Aries (2) and jinying0218 (1)
* 'develop' of https://github.com/jinying0218/BuildingMaterials:
  no message

Conflicts:
	BuildingMaterials.xcworkspace/xcuserdata/Ariel.xcuserdatad/UserInterfaceState.xcuserstate
no message