Steffen Buehl:
	- no grouping for orderhalls
	- fix building calculations
