checkpoint
Nearly complete content provider
Add the Timeline view
Merge branch 'master' of https://github.com/marakana/class-3131
fix merge