shell提交
Merge branch 'master' of https://github.com/jinghai/xxyyzz

Conflicts:
	server/shells/i-init.sh
	server/shells/i-mysql.sh
	server/shells/i-tomcat.sh
	server/shells/u-init.sh