Building merge, added Center
Added City and Building Centers, begin of neighbourhood
Merge branch 'master' of https://github.com/hft-swp/vcity.git

Conflicts:
	vCity/src/de/hft_stuttgart/swp2/model/Building.java