First step in the support of Hibernate 4
Avoid antlr to be included with silverpeas as dependency in order to use the one provided by JBoss
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Parent into hibernate4
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Parent into hibernate4
reset the version of the POM at 25-SNAPSHOT
Update version of some dependencies: aspectj, jersey, spring and hibernate. Yet hibernate 4.2 isn't supported by spring 3.2 (it will be with spring 4 and perhaps the support will be backported to spring 3.2.3), so we depend on the last version 4.1 of hibernate
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Parent into hibernate4
Merge branch 'hibernate4' of https://github.com/mmoqui/Silverpeas-Parent into mmo-feature4472

Conflicts:
	pom.xml