Merge pull request #129 from nuest/feature/spring

Update servlet configuration to Spring