Add Locate Control
Merge branch 'locationmarker'