stuff
Merge branch 'master' of https://github.com/SGD-GPSGames/GPSGames
Merge branch 'master' of https://github.com/SGD-GPSGames/GPSGames

Conflicts:
	GPSGames&Server/GPSGames/src/edu/virginia/cs/sgd/gpsgames/GameController.java
	GPSGames&Server/GPSGames/src/edu/virginia/cs/sgd/gpsgames/GameMapActivity.java
	GPSGames&Server/GPSGames/src/edu/virginia/cs/sgd/gpsgames/RaceActivity.java
more communication with server
Merge branch 'master' of https://github.com/SGD-GPSGames/GPSGames

Conflicts:
	GPSGames&Server/Echo/src/edu/virginia/cs/sgd/gpsgames/Race.java
Merge branch 'master' of https://github.com/SGD-GPSGames/GPSGames
Merge branch 'master' of https://github.com/SGD-GPSGames/GPSGames

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