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

Conflicts:
	com.sg.business.model/src/com/sg/business/model/Project.java
	com.sg.business.model/src/com/sg/business/model/Work.java
	com.sg.business.resource/src/com/sg/business/resource/nls/Messages.java
	com.sg.business.resource/src/com/sg/business/resource/nls/messages.properties
	com.sg.business.resource/src/com/sg/business/resource/nls/messages_de.properties
	com.sg.business.resource/src/com/sg/business/resource/nls/messages_en.properties
	com.sg.business.resource/src/com/sg/business/resource/nls/messages_fr.properties
	com.sg.business.resource/src/com/sg/business/resource/nls/messages_ja.properties
	com.sg.business.resource/src/com/sg/business/resource/nls/messages_zh.properties
	com.sg.business.resource/src/com/sg/business/resource/nls/messages_zh_HK.properties
Signed-off-by: LeiChengyang <lcy@yaozheng.com.cn>
Merge branch 'master' of https://github.com/sgewuhan/pm.git
Merge branch 'master' of https://github.com/sgewuhan/pm.git
Signed-off-by: LeiChengyang <lcy@yaozheng.com.cn>
Signed-off-by: LeiChengyang <lcy@yaozheng.com.cn>