merge for rekey
Merge remote-tracking branch 'origin/dev' into rekey

Conflicts:
	uxc/comps/jTab/_demo/example.html
改名,添加注释

稍后尝试使用YUIDoc生成文档