sync
dsaf
Merge branch 'master' of https://github.com/jose-soler/james

Conflicts:
	database/jamesDDL.sql
	pom.xml
	src/main/java/com/eclipsesource/json/QuestionToJsonConverter.java
	src/main/java/com/zanox/james/beans/JamesJPAService.java
	src/test/java/com/zanox/james/entities/QuestionToJsonConverterTest.java