Map Activity
Merge branch 'master' of https://github.com/SyntaxError2013/geekstars

Conflicts:
	Jogging/project.properties