Fixed activities detail page
Fixed some merge conflicts
Merge branch 'master' of https://github.com/kfreedland/CS169GAP
Fixed part of the profile page