Merge pull request #249 from bmeurant/master

update to spring 4.1.1 and spring-data 1.7.0