Signed-off-by: jinxitao <jxt@yaozheng.com.cn>
Merge branch 'master' of https://github.com/sgewuhan/pm.git

Conflicts:
	com.sg.business.model/src/com/sg/business/model/OrganizationProjectProvider.java


Signed-off-by: jinxitao <jxt@yaozheng.com.cn>