Emils Mapactivity
emil
emil user
Emil Change
New shit

nreedsdf
Revert "New shit"

This reverts commit 2b1bbe909d08b6ca05ac5efaa1fdcc34c51b0071.
Merge branch 'master' of https://github.com/AlienRunner/AndroidClient

Conflicts:
	src/com/spoton/alienrunner/MyMapActivity.java