commit local
Merge remote-tracking branch 'origin/master'

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