made some updates to html5 bp
merge conflict