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

Conflicts:
	Ruyicai_General/main/v_main/src/com/ruyicai/activity/buy/high/ZixuanAndJiXuan.java
	Ruyicai_General/main/v_main/src/com/ruyicai/activity/buy/jlk3/JiLinK3.java