Map no longer recenters automatically every few seconds, map zoom levels changed to show a nicer view
Merge branch 'ross'
resolving conflicts