Removing a part of duplication for code climate
routes
Fixing conflict in routes and pulling
Merge branch 'development' into integration
Merge branch 'integration'