add /work route
hot-fix on the duplicate route
Merge branch 'master' into develop