Added content provider and database handler
Merge branch 'develop'

Changes cover database implementation style and preferences.