merge
layout things
Add apk for checkpoint 3
Organize imports in SyncAdapter