finished adapting crud for new db module
Merge remote-tracking branch 'origin/master'