Merge pull request #208 from sdeleuze/master

Spring Data update
Update Jackson to 2.1.5