Updating to RC5
Merging pom.xml changes