Update
Merge branch 'master' of github.com:fireball/rails_templates
Merge branch 'master' of github.com:fireball/rails_templates
Remove inherited_resources gem (not working with rails 4 strong parameters)