Merge commit 'bbf3dfb203c3d74a72d59cae76ea5b664d0769c3'

Conflicts:
	src/com/leo/idauth/collect/CollectActivity.java
	src/com/leo/idauth/collect/CollectFingerFragment.java
	src/com/leo/idauth/collect/CollectHeaderFragment.java
	src/com/leo/idauth/collect/CollectIdCardFragment.java
fix minor bug