Rails 4 compatibility changes
Merge branch 'master' of github.com:thelabtech/common_engine