use Google Maps builtin location marker
Merge branch 'DA-318' into unstable

* DA-318:
  use Google Maps builtin location marker