take picture as comment & fix some bug

$15000
Merge remote-tracking branch 'origin/ui-wukai' into ui-lhc

Conflicts:
	bin/classes.dex
	bin/classes/com/smallcat/activity/LoginActivity.class
	bin/resources.ap_
	bin/zoo.apk