modified new and index of user
Merge branch 'development'