#72 new fields in EventGroup, basic form update
Merge branch 'master' into issue-72
organiZer->organiSer
Department organiser for event group now an oxpoints ID, pickable by typeahead
Organiser now saved correctly from EventGroup form
Updated event group (non-editing) view to show added fields.
Fixed missing group type in contributors homepage
Add migration for department->department_organiser
Added api call to retrieve event group information by id
Event form's department field updated when a new event group is selected. Not yet saved correctly.
Form now saves department as id only
Merge commit '09c3e765075b7207ca09116330496cf56472d099' into issue-72

Conflicts:
	talks/api/views.py
	talks/urls.py
Set valid locations for dev_data.
Fixed modal form to create event group
Edit and Show views for Person
Person list in contributors area
Updated dev data to include email addresses for all Persons
Merge branch 'master' into person-views

Conflicts:
	talks/events/views.py
add 'var'; remove 'todo'; handle groupID=null;
email -> email_address
Merge pull request #109 from ox-it/issue-72

Issue #72
Merge pull request #115 from ox-it/person-views

Person views
Merge branch 'master' into issue-66

* master:
  email -> email_address
  add 'var'; remove 'todo'; handle groupID=null;
  Edit and Show views for Person Person list in contributors area Updated dev data to include email addresses for all Persons
  Fixed modal form to create event group
  Set valid locations for dev_data.
  Form now saves department as id only
  Event form's department field updated when a new event group is selected. Not yet saved correctly.
  Added api call to retrieve event group information by id
  Add migration for department->department_organiser
  Updated event group (non-editing) view to show added fields. Fixed missing group type in contributors homepage
  Organiser now saved correctly from EventGroup form
  organiZer->organiSer Department organiser for event group now an oxpoints ID, pickable by typeahead
  #72 new fields in EventGroup, basic form update

Conflicts:
	talks/api/serializers.py
Added slug for Person