edit classpath for Spring cfg;
Add Spring 3 Core to pom.xml
Merge remote-tracking branch 'origin/develop' into develop