fixed link to current user
update user/show page
Merge branch 'LogIn'