Upgraded Spring and related to latest versions (4.0.4, e.g.)
Updated Spring and Spring Security to 4.0.5 and 3.2.4 respectively, plus other plugins in the pom.xml
resolve conflicts
Merge branch 'fixes'