update
Merge branch 'master' of https://github.com/fch415/jss

Conflicts:
	#1/jss#1_jcs_cn.md
	#1/jss#1_jcs_en.md