uncompleted users mapper
Merge remote-tracking branch 'origin/master' into broken-dependencies
db refactoring