Vaadin CDI Integration skeleton
Merge branch 'master' of https://github.com/antoniomaria/gazpachoquest

Conflicts:
	dao/src/main/resources/datasource-context.xml
	questionnaires-ui/src/main/resources/logback.xml
	questionnaires-ui/src/main/webapp/WEB-INF/root-context.xml
	rest/src/main/webapp/WEB-INF/web.xml
Dependency conflict with jackson solved finally