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

Conflicts:
	Ruyicai_General/main/v_main/src/com/ruyicai/activity/buy/jlk3/JiLinK3.java
update
Merge branch 'master' of github.com:momoplan/Android

Conflicts:
	Ruyicai_General/main/v_main/src/com/ruyicai/activity/buy/high/ZixuanAndJiXuan.java
Merge branch 'master' of github.com:momoplan/Android
update
Merge branch 'master' of github.com:momoplan/Android
modify
Merge branch 'master' of github.com:momoplan/Android