Refactor code that raises deprecating warnings in Rails 4
Merge pull request #1140 from stephankaag/code_refactoring

Refactor code that raises deprecating warnings in Rails 4