Ajax update response is correct from users show view
conflicts resolved
Merge branch 'master' of github.com:awanderingorill/snippets