fix for rails vulnerability
updated bundle
Merge branch 'master' into develop