Merge pull request #1 from feg-stuttgart/beta

Update layouts