huhuhuhuhue
Merge branch 'MEGAMAAAAN' into master_2

Conflicts:
	src/scenes/buildingManager.js