modify the nmk3
	modified:   AndroidManifest.xml
	new file:   res/drawable-hdpi/nmk3_zoushitu.png
	modified:   res/layout/nmk3_paly_title_layout.xml
	modified:   src/com/ruyicai/activity/buy/high/ZixuanAndJiXuan.java
	modified:   src/com/ruyicai/activity/buy/jc/oddsprize/JCPrizePermutationandCombination.java
	modified:   src/com/ruyicai/activity/buy/jc/touzhu/RadioGroupView.java
	modified:   src/com/ruyicai/activity/buy/nmk3/Nmk3Activity.java
	modified:   src/com/ruyicai/activity/buy/nmk3/Nmk3HeZhiActivity.java
	renamed:    src/com/ruyicai/activity/buy/nmk3/Nmk3DiffActivity.java -> src/com/ruyicai/activity/buy/nmk3/Nmk3ThreeDiffActivity.java
	modified:   src/com/ruyicai/activity/buy/nmk3/Nmk3ThreeSameActivty.java
	renamed:    src/com/ruyicai/activity/buy/nmk3/Nmk2DiffActivity.java -> src/com/ruyicai/activity/buy/nmk3/Nmk3TwoDiffActivity.java
	modified:   src/com/ruyicai/activity/buy/nmk3/Nmk3TwoSameActivty.java
	modified:   src/com/ruyicai/json/miss/Nmk3MissJson.java
	new file:   src/com/ruyicai/net/newtransaction/NMK3MissInterface.java
	modified:   src/com/ruyicai/pojo/AreaNum.java
Merge branch 'master' of github.com:momoplan/Android

Conflicts:
	Ruyicai_General/main/v_main/src/com/ruyicai/pojo/AreaNum.java
merge
	modified:   src/com/ruyicai/activity/buy/zixuan/JiXuanBtn.java
modify the ui of nmk3
	modified:   res/layout/sscbuyview.xml
	modified:   res/layout/ssczhixuan.xml
	modified:   res/values/color.xml#
	modified:   src/com/ruyicai/activity/buy/BuyActivityGroup.java
	modified:   src/com/ruyicai/activity/buy/high/ZixuanAndJiXuan.java
	modified:   src/com/ruyicai/activity/buy/nmk3/Nmk3ThreeDiffActivity.java
	modified:   src/com/ruyicai/activity/buy/nmk3/Nmk3TwoSameActivty.java
Merge branch 'master' of github.com:momoplan/Android