fixed merge conflict in router.coffee
fixed merge conflict in router.coffee

scalableminds/webknossos,scalableminds/webknossos,scalableminds/webknossos,scalableminds/webknossos,scalableminds/webknossos,scalableminds/webknossos