Added strong parameters, fixed users#show bugs
Merge conflict resolution