navi bar for user.html
Merge branch 'fry' into dev