repaired user edit
Merge branch 'master' of https://github.com/lkrsnik/scrum_app

Hope last merge with usr edit.