Merged with Emils maps
Merge branch 'master' of https://github.com/AlienRunner/AndroidClient.git
New icons
Merge branch 'master' of
https://github.com/AlienRunner/AndroidClient.git

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