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

Conflicts:
	XYComPayMiddleWare/src/com/xy/xypay/activity/XYLoginActivity.java
``