Merge pull request #225 from vreddy18/master

Add dropdown functionality to navbar
Fix friend styling(picture and name)
Fix merge conflict in navbar.js
Merge branch 'dev' of https://github.com/gowaddle/waddle
Merge pull request #226 from vreddy18/master

Add footprintCount property to usernode
Add navbar settings dropdown styling.
Fix merge conflicts in friends.html
Merge pull request #227 from byeo630/dev

Dev
Merge branch 'dev' of https://github.com/gowaddle/waddle
Update to angular 1.3 and remove status fetching from userController because of fb API error