modify
Merge branch 'master' of github.com:momoplan/Android

Conflicts:
	Ruyicai_General/v4.0.0_plugin/src/com/alipay/android/secure/AlipaySecurePayDialog.java
	Ruyicai_General/v4.0.0_plugin/src/com/ruyicai/activity/account/AlipaySecureActivity.java