gongchen
Signed-off-by: unknown <SteveGC@SteveGC-PC.(none)>
Merge branch 'master' of github.com:YuhangGe/kankan

Conflicts:
	app_android/src/android/kankan/mainprofile/MainProfile.java
	app_android/src/android/kankan/waterfall/WaterFallUser.java

Signed-off-by: unknown <SteveGC@SteveGC-PC.(none)>