updated in verification; updated db
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/phr/dao/sqlimpl/VerificationDaoImpl.java
fixed conflict