fix html5mode and remove css
Merge branch 'master' into server