we shouldn't be passing wagtailuserbarcss to the wagtailuserbar tag now, as it mistakes it for a current_page setting
Merge branch 'develop'
Merge remote-tracking branch 'origin/master'
Merge branch 'develop'
staff location displayed for staff type technical only
field_staffpage_schools_required
field_staffpage_schools_not_required
Merge branch 'frayling/feature/staff-location' into develop
Fixed migration number clash