Merge branch 'develop'
strong_params fix
Merge branch 'master' into develop