Merge branch 'david3' into david4
Merge branch 'master' into david4
Merge branch 'david3' into david4
Merge branch 'david3' into david4
Thread termination.
More attempts (none successful) to get the client/server threads to terminate.
Merge branch 'david3' into david4
Merge remote-tracking branch 'origin/bea' into david4

Conflicts:
	sosgame1/src/com/example/sosgame1/MainActivity.java