modified default.html css js

remerge master branch