updated wagtail to latest version
Merge branch 'feature/new-student-page' into staging
Merge branch 'feature/new-student-page' into staging
Merge branch 'feature/new-student-page' into staging
Merge branch 'feature/new-student-page' into staging
Merge branch 'feature/showrca2014' into staging
Merge branch 'feature/showrca2014' into staging
Merge branch 'feature/showrca2014' into staging
Merge branch 'develop' into staging
Extra debug code for Chris' card
Merge conflict
Merge branch 'develop' into staging
Merge branch 'develop' into staging
Merge branch 'staging' of github.com:torchbox/verdant-rca into staging
Updated wagtail
Moved RCA specific search config into urls.py
Updated suggestions code to use new field names
Merge branch 'feature/wagtail-update' into staging
Merge branch 'feature/showrca2014' into staging
Fix to show staff role for staff_feed.html

Copied the staff_role to the staff page in models.py (since it was in the
parent model) and changed {{ staff }} to {{ staff.staff_role }} to
staff_feed.html