Moved get current location button to toolbar
Merge remote-tracking branch 'origin/master'