rpcservice
Merge remote-tracking branch 'origin/master'

Conflicts:
	XYComPayMiddleWare/AndroidManifest.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
rpcservice
Merge remote-tracking branch 'origin/master'