Remove old javascript and html5 code.
Merge branch 'master' into logging