+Added Methods to building
+BuildingType
Merge remote branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote branch 'origin/master'