dit gaat merge conflicten geven
mergemaster
Merge branch 'master' of https://github.com/jan-vandorpe/mctesting.git into mergemaster
question validation - minimum 2 answers
catname bij testselect
approot done ?
2804
categorie weg
Merge branch 'master' of https://github.com/jan-vandorpe/mctesting
premerge
Merge branch 'master' of https://github.com/jan-vandorpe/mctesting
Merge branch 'bram' of https://github.com/jan-vandorpe/mctesting.git
Merge branch 'master' of https://github.com/jan-vandorpe/mctesting
Merge branch 'thomas-applicationroot'
aanpassingen na test met Jan
Merge branch 'master' of https://github.com/jan-vandorpe/mctesting.git into mergemaster
createquestion app.root
Merge origin/bert into mergemaster2000
 template check