added some tests for user show page
added tests for edit page
Merge branch 'master' into mcarthur