Merge pull request #12 from muellners/develop

Update spring to version 2.x.x