first ok.
Merge branch 'master' of github.com:lidianzhe/irisclient_arm_all

Conflicts:
	share/AizheTech/Enroll.db
first ok.