no message
Merge branch 'master' of https://github.com/YassirDriuch/Accent

Conflicts:
	war/WEB-INF/classes/META-INF/jdoconfig.xml