Cleaned up Building.java
Merge remote-tracking branch 'flush-origin/feature/models' into feature/models

Conflicts:
	app/src/main/java/com/palindromicstudios/mcflush/Building.java
Merge branch 'feature/models' into develop