Merge branch 'allen'
Changes in the local map UI
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013