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

Conflicts:
	com.sg.sales/plugin.xml