Support routing with history API
Merge branch 'develop'