Merge branch 'production'
strong parameters
Merge branch 'master' into production