Conflicts: LocationLib/libs/android-support-v4-r11-googlemaps.jar LocationLib/src/com/TwentyCodes/android/fragments/BaseMapFragment.java LocationLib/src/com/TwentyCodes/android/location/MidPoint.java LocationLib/src/com/TwentyCodes/android/overlays/RadiusOverlay.java