moved current location button
fixed merge conflict
Merge branch 'moved_current_location_button' of https://github.com/LightningLord/errandsontheway into bug-97
Merge pull request #107 from LightningLord/moved_current_location_button

Moved current location button
Merge branch 'master' of https://github.com/LightningLord/errandsontheway into bug-97