Börjat utöka kommunikation mellan klient och server

och lite annat klydd
Merge branch 'Tobias'
La till if-sats i getStartConditions
Lade till KlientID
Merge branch 'Me'
Merge branch 'Tobias'
Merge branch 'master' of https://github.com/essob/Client1
Merge branch 'master' into Tobias
stavfel
tanke kring kortvisning i panel
Merge branch 'Tobias'

Conflicts:
	PlayLabel.java
Merge branch 'master' into Me

Conflicts:
	ClientConnection.java
	ClientController.java