building properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/scripts/building.js
	assets/scripts/money.js
	assets/scripts/soul.js
moved crusher