correct user add
merge conflict
fix some bugs
bugs fix
Merge pull request #165 from cherkasovas/master

fixed bugs with user add/edit