Implementing user edit
Merge branch 'user-crud'