working on activity
Merge branch 'master' into public_activity
trying to fix connections
Merge pull request #53 from ecasilla/public_activity

Public activity