Chris: more and more code
Merge origin/Chris into Chris

Conflicts:
	GroupThinkClient/src/groupthinkclient/GroupThinkClient.java