More work on MapDetailActivity
Merge branch 'master' of https://github.com/2014DaemonDash/team-punch