add user/profile stuff
Merge remote-tracking branch 'upstream/master'
addd profile links