Migration from ActionBarSherlock to the new Android AppCompat ActionBar
implementation.
Notification & alerts overhaul to support calibration.
Initial contact log calibration work + bug fixes.
Contact log calibration implementation.
Location calibrator work.
Merge commit.
Merge remote-tracking branch 'origin/cjk-development' into
cjk-development

Conflicts:
	Purple Robot Manager/res/values/strings.xml
Location activity work
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
Sanity check cleanups
Tying cluster to location readings
Calibration integration.
Initial S-expression support.
Preference experiments
Support for exporting configuration schema.
Location calibrator fixes + "never" option in configuration update
refresh intervals.
Sensor config updates