控件类型管理 提交2
Merge remote-tracking branch 'origin/master'

Conflicts:
	OilManage/src/struts.xml