some more dialog + markers back
Merge branch 'master' of https://github.com/moovida/geopaparazzi