Fixing rebase problems - enabling html5mode for URLs