Merge branches 'html5gamesite' and 'master'
Merge branches 'html5gamesite' and 'master' into html5gamesite