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