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

Conflicts:
	com.sg.business.pm2/OSGI-INF/l10n/bundle_de.properties
	com.sg.business.pm2/OSGI-INF/l10n/bundle_en.properties
	com.sg.business.pm2/OSGI-INF/l10n/bundle_fr.properties
	com.sg.business.pm2/OSGI-INF/l10n/bundle_ja.properties
	com.sg.business.pm2/OSGI-INF/l10n/bundle_zh.properties
	com.sg.business.pm2/OSGI-INF/l10n/bundle_zh_HK.properties

Signed-off-by: jinxitao <jxt@yaozheng.com.cn>