Version bump and upgrade message
Don't signal migration success with a preference--find a better solution
Use a flag to indicate that sync migration is ongoing
timeForBackgroundSync() should have additional conditions besides just whether or not migration is ongoing
Switch to newly created list after save
Update GCMIntentService to use new sync messaging
Merge and resolve conflicts from upstream/master
Removed dead code from sync unit test
Added history model and dao
Fixed a bug when resolving uuid conflicts in make changes, refactored some JSON-to-model code into static helper methods for future use
Added a unit test for resolving uuid collisions
Implement a cloneAs method for properties to make aliasing for joins easier, use it in TaskAdapter and UpdateAdapter
Added History model properties to NameMaps
Updated ip address
Use a map from messages to callbacks instead of two parallel queues. This should resolve some timing bugs--callbacks will only be called in the same loop that their message ocurrs
Don't allow sync callbacks to crash the sync thread
Don't use a flag for indicating ongoing sync migration. Reading it from a preference fixes an issue where the sync thread could run before the migration had started
Create the history table for new users