Merge branch 'map'
Merge branch 'map'
Merge branch 'map'
* Introducing a workaround for osmdroid setCenter strange behavior.
Saved location will be dropped when upgrading the app to this version.
Merge branch 'master' into map