``
Merge remote-tracking branch 'origin/master'

Conflicts:
	XYComPayMiddleWare/res/values/com_xy_xypay_styles.xml