stuff
Merge branch 'master' into sgmbranch

Conflicts:
	src/client/Client.java