adding in changes to mapview in order to pull down most recent code
Fixing merge conflict in MapView.js
Added in functionality to re-center map to the marker upon click
Cleaning up the commented out code