修改module的结构
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/res.json
	res/res.version