Merge branch 'stundzigs-swagger4spring-web'