Refactor routes in order to be compatible with Rails 4
Merge pull request #1123 from stephankaag/rails4-new

Refactor routes in order to be compatible with Rails 4
Merge remote-tracking branch 'upstream/master'