fixes for keeping connection and clearing incoming messages
server as is.
Merge remote-tracking branch 'origin/server'
commiting the merge
Merge branch 'master' of https://github.com/SGD-GPSGames/GPSGames.git

Conflicts:
	GPSGames&Server/GPSGames/src/edu/virginia/cs/sgd/gpsgames/GameMapActivity.java