Change version of pom.xml to 2.5.2-SNAPSHOT
Merge branch 'branches/rudder/2.5'

Conflicts:
	pom.xml