DO NOT MERGE
This branch relies on request !127 (merged) Changes for the demo:
/roles
mpigmans
mvandeursen
ghabbenjansen
rkeulemans