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