Merge branch 'rails_4.0_upgrade' of github.com:Quoin/RapidFTR into rails_4.0_upgrade
Merge branch 'rails_4.0_upgrade' of github.com:Quoin/RapidFTR into rails_4.0_upgrade
Fix to cucumber error:  Expecting an array or keyed hash for property User#role_ids (RuntimeError)
Merge pull request #21 from jtoliver/rails_4.0_upgrade

Rails 4.0 upgrade