Tafelserver geflickt
...
Merge branch 'master' of https://github.com/kkalicki/panelizer.git

Conflicts:
	tafel.xml