fixed db
Merge branch 'master' of https://github.com/astrider/sante

Conflicts:
	WEB-INF/createtable.sql