Fix issue where players appear on other client's screens when they shouldn't
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/src/client/main/CodenameNovak.java
Fix merge