走势图投注修改
Merge branch 'master' of github.com:momoplan/Android

Conflicts:
	Ruyicai_General/main/v_main/src/com/ruyicai/activity/buy/zixuan/ZiXuanTouZhu.java
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:momoplan/Android