Database code cleaning
Merge branch 'master' of github.com:giza10/keep-doing
Database clean up