Merge pull request #1 from cheekbyname/HEAD

Head
Merge pull request #2 from cheekbyname/HEAD

End-of-day push.
Merge pull request #3 from cheekbyname/HEAD

End-of-day push. Refactoring of ContentProvider and SyncAdapter, general...
Merge pull request #4 from cheekbyname/master

Branch Merge