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

Conflicts:
	R:uyicai_General/main/v_main/src/com/ruyicai/activity/buy/guess/RuyiGuessBuyScoreActivity.java
	Ruyicai_General/v4.2.4/.settings/org.eclipse.jdt.core.prefs
	Ruyicai_General/v4.2.4/AndroidManifest.xml
	Ruyicai_General/v4.2.4/res/layout/buy_jc_lq_sfc_layout.xml
	Ruyicai_General/v4.2.4/res/layout/buy_jc_zq_bf_layout.xml
	Ruyicai_General/v4.2.4/res/layout/buy_jc_zq_bqc_layout.xml
	Ruyicai_General/v4.2.4/res/layout/buy_jc_zq_jq_layout.xml
	Ruyicai_General/v4.2.4/res/layout/buy_lq_hun_dialog.xml
	Ruyicai_General/v4.2.4/res/layout/buy_lq_sfc_dialog.xml
	Ruyicai_General/v4.2.4/res/layout/buy_zc_4cjq_layout.xml
	Ruyicai_General/v4.2.4/res/layout/buy_zc_lcb_layout.xml
	Ruyicai_General/v4.2.4/res/layout/buy_zh_view_item.xml
	Ruyicai_General/v4.2.4/res/layout/buy_zq_hun_dialog.xml
	Ruyicai_General/v4.2.4/res/layout/ruyicai_titlebar.xml
	Ruyicai_General/v4.2.4/res/values/dimens.xml
	Ruyicai_General/v4.2.4/res/values/strings.xml
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/BuyActivity.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/beijing/BeiJingSingleGameActivity.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/beijing/adapter/HalfTheAudienceAdapter.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/beijing/adapter/OverAllAdapter.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/beijing/adapter/TotalGoalsAdapter.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/cq11x5/Cq11Xuan5.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/dlc/Dlc.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/guess/RuyiGuessActivity.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/guess/RuyiGuessCreateGroupSuccessActivity.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/guess/RuyiGuessCreateSubjectActivity.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/guess/RuyiGuessDetailActivity.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/guess/RuyiGuessSelectSubjectActivity.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/high/ZixuanAndJiXuan.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/jc/JcMainActivity.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/jc/JcMainView.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/jc/zq/view/BQCView.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/miss/BuyViewItemMiss.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/miss/ZHmissViewItem.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/miss/ZixuanActivity.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/ten/TenActivity.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/zc/FootBallMainActivity.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/zc/pojo/TeamInfo.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/buy/zixuan/BuyViewItem.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/activity/home/MainGroup.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/component/custom/checkbox/MyCheckBox.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/component/custom/gallery/GalleryViewItem.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/component/custom/gallery/Lights.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/component/custom/jc/button/MyButton.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/component/custom/view/TitleBar.java
	Ruyicai_General/v4.2.4/src/com/ruyicai/util/compress/CompressStr.java