Updated rails
Merge branch 'develop' into rails-402
Merge pull request #85 from eMergence-by-Design/rails-402

Rails 402