Added database stuff.
Merge remote-tracking branch 'origin/master'
Added database stuff.