Make html5 url routing work on dev
Fix merge conflict in package.json
Fix merge confliuct in Gruntfile.js
Merge from master