Rename BasicMapActivity class into MapActivity
Change the type of MainActivity back to Activity instead of FragmentActivity