Removing security per method and updating show.gsp of user
Updating user show view
Resolving conflicts Merge branch view