html5 and javascript
Merge branch 'master' of https://github.com/mrpan/html5