合并
Merge branch 'master' of https://github.com/wcf1987/OilManage.git

Conflicts:
	OilManage/src/cn/edu/cup/gui/action/GUIAction.java