Merge branch 'master' of https://github.com/codecentric/spring-samples
Merge branch 'master' of https://github.com/codecentric/spring-samples