Fix routes.rb
Merge branch 'feature/roles'