Updated spring version and small pom.xml refactoring.
Merge remote-tracking branch 'origin/master'