commit map activity
commit mapres
Merge branch 'master' of https://github.com/Pancia/hackathon into CGravelBranch