pre-pull commit
Merge origin/master

Conflicts:
	src/survivalist/control/BuildingControl.java
	src/survivalist/view/BuildingView.java