Added sqlite database. Accessor methods to come
Merge remote-tracking branch 'origin/master'
Resolve conflicts