fix bugs
Merge branch 'dev' of github.com:mingzhi22/html5dw into dev