Squashed 'yoink/' changes from 36a9aba..6b30030
Squashed 'yoink/' changes from 36a9aba..6b30030

6b30030 try again
fdaeed1 fixed layout-example
4a861b6 moved layout-example from server to client repo

git-subtree-dir: yoink
git-subtree-split: 6b30030e8ab1276188707e47793c16c4de9779ab

garious/icontrib,garious/icontrib