Updating location probe activity to new Google Maps API.
Location calibration work.
Merge committing.
Merge remote-tracking branch 'origin/cjk-development' into
cjk-development

Conflicts:
	Purple Robot Manager/res/layout/layout_location_label_activity.xml
	Purple Robot Manager/res/values/strings.xml
	Purple Robot
Manager/src/edu/northwestern/cbits/purple_robot_manager/activities/LocationProbeActivity.java