Added inbox icon, fixed badge display bug in friend activity
Merge branch 'refs/heads/master' of ssh://git@github.com/danduncan/QuizSite.git