before db refactor
Merge branch 'master' of https://github.com/netelder/flashcardsp2
complete rebase