einde dag 10-12
Merge branch 'master' of https://github.com/Lefthandmedia/wenb

Conflicts:
	core/packages/articles-1.7.5-pl/modCategory/c25afbfd3d0e59b1eda370925687dea8.0.preserved.zip
	core/packages/articles-1.7.5-pl/modCategory/c25afbfd3d0e59b1eda370925687dea8.1.preserved.zip
	core/packages/quip-2.3.3-pl/preserved.php
	staticScripts/chunks/HTML-END.html
fix menu
Merge branch 'master' of https://github.com/Lefthandmedia/wenb

Conflicts:
	core/components/wayfinder/configs/wenb.config.php
	staticScripts/chunks/maincontent.html