new version of router
added stylesheet
Merge branch 'dev'