Update the POMs to prepare the Rudder 2.5.0 RC1 release
Some use of Scala 2.10 string interpolation and exception handlers
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  Update the POMs to prepare the Rudder 2.5.0 RC1 release

Conflicts:
	pom.xml
Merge branch 'master' into proto_scala2.10

* master:
  Update the POMs to prepare the Rudder 2.5.0 RC1 release