Merge branch 'release/2.1.4' into develop
update Gemfile to bump Rails version for security
Version bump to 2.1.5
Merge branch 'release/2.1.5'