pulling in master
Merge branch 'master' into front-end
working on profile page, activities added