Created edit view and modified controller for User edit view
Merge origin/master