do not inherit PublicActivity::Activity
Merge branch 'master' into rails4