fix db_create
Merge remote-tracking branch 'origin/db' into db

Conflicts:
	betsys-dao/pom.xml
	betsys-dao/src/main/resources/db_create