fixed server
Merge branch 'network/network-player' of https://github.com/krukon/paper_soccer into network/network-player

Conflicts:
	src/main/java/ui/GameResultDialog.java
	src/main/java/ui/WaitForOpponentDialog.java