Card #48 remove duplicate routes
Merge remote-tracking branch 'origin/develop' into develop