ContactMine Bug
ContactMine Bug
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
cOMMIT
Merge remote-tracking branch 'origin/master'

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/hud/OptionStage.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/states/OptionState.java
ContactMine is ready
Merge remote-tracking branch 'origin/master'