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

Conflicts:
	Ruyicai_General/main/v_main/res/values/array.xml
	Ruyicai_General/main/v_main/src/com/ruyicai/activity/buy/ssq/BettingSuccessActivity.java
	Ruyicai_General/main/v_main/src/com/ruyicai/activity/usercenter/BetQueryActivity.java
update