投注、追号、合买、赠送界面优化；快三增加收益率追号；竞彩订单界面优化
Merge branch 'master' of github.com:momoplan/Android

Conflicts:
	Ruyicai_General/main/v_main/res/layout/alert_dialog_beijing_touzhu.xml
	Ruyicai_General/main/v_main/res/layout/alert_dialog_jc_touzhu.xml
	Ruyicai_General/main/v_main/res/layout/order_hemai.xml
	Ruyicai_General/main/v_main/res/layout/order_zengsong.xml
	Ruyicai_General/main/v_main/res/layout/order_zhuihao.xml
	Ruyicai_General/main/v_main/src/com/ruyicai/activity/buy/high/HghtOrderdeail.java
	Ruyicai_General/main/v_main/src/com/ruyicai/activity/buy/jc/zq/view/HunHeZqView.java
	Ruyicai_General/main/v_main/src/com/ruyicai/activity/buy/jc/zq/view/RQSPFView.java