#117 Proxy title in views if event not yet titled.
proxy description on show event. Don't show topics field if no topics.
#127 - terminology update for event editors
#90 text consistency/grammar in event edit form
#141 Allow group description to be blank
Merge branch 'master' into fix-event-form

* master:
  #90 text consistency/grammar in event edit form
  #127 - terminology update for event editors
  #117 Proxy title in views if event not yet titled. proxy description on show event. Don't show topics field if no topics.

Conflicts:
	talks/events/forms.py
#142 Department -> Organising department
Also added email addresses for sample users in dev_data
Merge branch 'master' into fix-event-form

* master:
  #142 Department -> Organising department Also added email addresses for sample users in dev_data
  #141 Allow group description to be blank
Fix broken tests after e2a435d
Fix tests after f24d775
Disabled coverage for unit tests -- not accurate anyway