assignments op adminpanel
Merge branch 'Joep' into development