Enable HTML5 routing
Merge origin/master