update
Merge branch 'master' of https://github.com/army8735/army8735.github.io

Conflicts:
	jsdc/web/Generator.js
	jsdc/web/Jsdc.js
	jsdc/web/Klass.js
	jsdc/web/eventbus.js