DB added
Merge branch 'Rake-tasks'