Fix null pointer error.
Merge branch 'master' of ssh://git@github.com/hottehead/GameDevWeek.git

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/NetworkManager.java