Fix javadoc and jsdoc
Merge remote-tracking branch 'RaymondChao/fix-doc'