Fixed conference on event form (#113)
EventGroup picker now uses bootstrap
Fix editor set
Merge branch 'master' into fix-event-form

* master:
  Removed legacy SpeakerQuickAdd form
  Improve template / in case of no affiliaiton
  API_OX urls on https
Fix topics/speakers by providing initial data
Topics/Speakers do not create if relation with Event already exists
Added comment explainingn commit=False
Fixed tests and JS after updating the group field in 65e697eeedd64e1d3f88319d5e2585d5614d653e
Added test on "Save and add another talk"
Merge branch 'master' into fix-event-form

* master:
  Remove quotes from keyword variables
  Use variable for it services location in edit test
  Tidied up. Added 'page not contain text' keyword.
  Added tests to remove speaker, topics
  Fix test for location removal
  Added tests for removing location Added tests for displaying speakers, location, department, topics, editors
  Most basic test for editing an event. Edit page should appear with correct title.
functional tests: do not dumpdata by default -- should speedup the execution a bit
Avoid adding multiple times the same editor when creating the event
Fixed editor_set usage
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
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
Attempt to simplify writing func tests
Fixed tests failing because of AJAX calls
Fixed remove speaker test (fixed the test, not the code..)