aaa
Merge branch 'master' of https://github.com/SkyeSong38/huayouGas

Conflicts:
	trunk/src/.settings/org.eclipse.core.resources.prefs
	trunk/src/WebRoot/WEB-INF/classes/com/yinxing/ranqi/action/ProjectAction.class
	trunk/src/WebRoot/WEB-INF/classes/com/yinxing/ranqi/service/ProjectService.class