Database and ContentProvider implemented
Merge remote-tracking branch 'origin/master'