adding nav links on user_network view to friends, and some in friend views
Merge branch 'master' into development_a