Merge pull request #1 from Progroep/master

Update the MM fork to latest
Update to master
Update
update
update
Update met samenvoegen pagina
Merge pull request #5 from gouwestadmm/master

Update MM fork
Merge pull request #6 from Progroep/master

Update gh-pages to latest