Layout, overriding templates...
Merge branch 'master' of https://github.com/oenix/danstabulle