Fixed clear db method to fit new design
Merge remote-tracking branch 'origin/master'