Add users#show
Merge branch 'f5' into dev