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

Conflicts:
	GPSGames&Server/GPSGames/AndroidManifest.xml
Merge branch 'master' of https://github.com/SGD-GPSGames/GPSGames