conforming to rails 4 mass assignment rules
Merge branch 'master' of https://github.com/sharamall/peli