added current location icon
merged current-location with master branch