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

Conflicts:
	com.sg.business.commons/src/com/sg/business/commons/ui/flow/ProcessSettingPanel2.java

Signed-off-by: ghuazh <ghuazh@gmail.com>