update UI and db
Merge branch 'andy'

Conflicts:
	src/com/leo/idauth/MainActivity.java
	src/com/leo/idauth/collect/CollectHeaderFragment.java