added user link on nav bar
Merge branch 'develop'