Fixed strong parameter bug efter upgrading to rails 4.1.1
Merge branch 'develop'