Multiple fixes to routing and history
Merge branch 'master' of https://github.com/cosminrentea/roda.git