Signed-off-by: ghuazh <ghuazh@gmail.com>
Merge branch 'master' of https://github.com/sgewuhan/PM2.git

Conflicts:
	com.sg.business.model/plugin.xml
	com.sg.business.model/src/com/sg/business/model/Folder.java
	com.sg.business.resource/src/com/sg/business/resource/BusinessResource.java
	com.sg.business.vault/plugin.xml