Finish user edit, update, index, and destroy actions
Merge branch 'develop'