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

Conflicts:
	com.tmt.gs/plugin.xml