Fixed merging mistakes from past couple commits, added back in LocationDialogFragment and LocationUtils, added functionality that went missing from MapActivity and MapScreenLongClickListener, reverted maps apikey change in manifest, renamed maplayout for screen and menu layouts to screen_maplayout and menu_maplayout again, commented out a function loadPublicGroup from MapActivity which was causing the app to crash.  App is now stable again with former functionality restored and new changes merged correctly.