user show page improvements
Merge branch 'usershow'

Conflicts:
	app/views/users/show.erb