Signed-off-by: rabbit520 <195818145@qq.com>
Merge branch 'master' of https://github.com/sgewuhan/pm.git

Conflicts:
	com.sg.business.project/src/com/sg/business/project/setup/ProjectDelete.java
Merge branch 'master' of https://github.com/sgewuhan/pm.git