Current location zoom
Conflicts fixed Merge