Added Current Location Button
fix merge conflicts
fix merge conflicts