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