Re-add markers to map
Merge branch 'gh-pages' of https://github.com/EMT/fieldwork-v2 into gh-pages