Change-Id: Icdfc1ceef38dbe378dbf12d843f53dcc02eaef44
Signed-off-by: Nicolas <studium@nmarin.de>
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/DiscoObjectManager.java
	src/GameView.java