修改
Merge remote-tracking branch 'origin/develop-nbpa' into develop-nbpa

Conflicts:
	bpmcenter/conf/FixConfig.xml