啦
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/com/lvg/entity/AddUser.class
	build/classes/com/lvg/entity/LoginModule.class
	build/classes/com/lvg/login/CertPicture.class