Use permitted_params in inherited_resources 1.4.0
2.0.4
Merge branch '2-stable' of github.com:ging/social_stream