提交到本地
测试使用Egit代码提交功能
继续测试
Merge branch 'master' of
https://github.com/guavaOrganization/enjoysport.git

Conflicts:
	src/com/business/enjoysharing/controller/EnjoySharingController.java