End-of-day push. Refactoring of ContentProvider and SyncAdapter, general...

... tidy up of repo.