Dealt with consequences of unicastremoteobjects
merge
merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/s32a/Client/ClientData/LobbyClient.java
Revert "merge"

This reverts commit 4afcbc024d057cec976ab507d71038d00d1967ba.
Merge branch 'master' of https://github.com/PTS32A/Airhockey