Merge branch 'master' into admin
Remove separate 'event type' table.
Merge branch 'tmp' into admin
Bugfix: EventType model still being referenced.
Clean up Member admin views.
Clean up Membership admin views.
Display member count on committee list view.
Handle inline memberships on committee form views.
Remove redundant membership view.
Display committees memberships on member list view. Bugfix: add template file to repo.
Link memberships through to relevant committee pages.
Merge branch 'admin'