fixed spacing of words caused by jsbeautify
Merge branch 'master' into gh-pages