Yanked out the MapView and replaced with MapFragment
Merge remote-tracking branch 'origin/master'