merge
Merge branch 'master' of https://github.com/T1m1/de.htwg.se.monopoly.git

Conflicts:
	HtwgMonopoly/src/de/htwg/monopoly/controller/impl/Controller.java