fix merge
mettestcreation
Merge branch 'bert' of https://github.com/jan-vandorpe/mctesting into mergecheck
Merge branch 'hendrik' into mergecheck
merconflictfixhelper
fixedbramfiles
answertest.php
shuffletest succeed
hendrik update
fix lege subcategorie
mergemetbram
testmodify
change testcreation
activeren/deactiveren (sub)categorieen
18/04 subcats
template/css veranderingen
eindedag 18/04 subcattest
eerste
tweede
Merge branch 'hendrik' of https://github.com/jan-vandorpe/mctesting.git into 18/04_MergeAll