import all from master
resolve confilct
disable cname
make the new index.html default
fix heroku url