Merge branch 'feature/edit_user' into develop