Fix friend styling(picture and name)
Fix merge conflict in navbar.js
Add navbar settings dropdown styling.
Fix merge conflicts in friends.html
Merge pull request #227 from byeo630/dev

Dev