fixed ASM_JS setting in emcc invocation
Merge branch 'master' into gh-pages