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

Conflicts:
	app_android/res/values/strings.xml

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