fixe routing for some nicer looking urls
Merge branch 'routing' into dev