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

Conflicts:
	Ruyicai_General/main/v_main/src/com/ruyicai/activity/buy/guess/RuyiGuessDetailActivity.java
	Ruyicai_General/main/v_main/src/com/ruyicai/activity/more/MoreActivity.java
	Ruyicai_General/main/v_main/src/com/ruyicai/util/PublicMethod.java
	Ruyicai_General/main/v_main/src/com/ruyicai/util/RWSharedPreferences.java
Merge branch 'master' of github.com:momoplan/Android
update