Fix hibernate bugs
Merge branch 'master' of https://github.com/estebanroblesluna/ssurvey

Conflicts:
	modules/ssurvey-webapp/src/main/resources/hibernate/hibernate-mappings.xml