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'
Added 'Research & Knowledge Exchange' to AREA_CHOICES
Added migration to merge 'Research' and 'Knowledge Exchange' areas together
Removed 'Research' and 'Knowledge Exchange' from AREA_CHOICES
Fixed crash in migration 213
Update to latest Wagtail (which removes custom RCA styles from rich text editor) and reapply RCA styles with the new insert_editor_css hook
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
Merge branch 'develop' into staging