modal is fixed
Merge pull request #46 from Hilaryous/activities-page

modal is fixed
Adds activities to user serializer
Merge remote-tracking branch 'upstream/master' into front-page