fixed some minor issues
Merge branch 'master' of https://github.com/msmolle/swa.git

Conflicts:
	swazam-client/src/main/java/org/tuwien/swalab2/swazam/client/Client.java