Updating for 3.0 activities.
Merge pull request #25 from ngodfraind/3.0-update

Updating for 3.0 activities.