spring context and pom files little tweaked
Merge remote-tracking branch 'origin/master'