js
Merge branch 'master' of https://github.com/jiasoft/chetu

Conflicts:
	kline.html
flash