tssJS 15%
Merge branch 'master' of https://github.com/waitwind/jinhe-tss-JS

Conflicts:
	testTssJS.html
	tssJS.js