Started to work on scaling MapView
Merge remote-tracking branch 'origin/master'