PoC facet query "Past talks", "Next seven days", "Future"
Configure facet start date
"Pretty" names for range queries
Merge branch 'master' into search-facet-date

* master:
  Update default endpoint to protocol relative URL
  Assert we don't get both an event and group
  Return 404 if no item is found
  Updated serializers to use get_absolute_url
  Added JS template for groups
  Render out EventGroups which have no `type`
  Remove item and return full item
  Serialize Event and EventGroup with class_name
  Added case statements to handle Event/EventGroup
  Correct JS hooks in the html
  Added remove_item on Collection model
  lint
  Basic EventGroupSerializer
  Added add/remove item endpoints
  Updated JS to be generic on collection items
  First commit at generic adding items to collection

Conflicts:
	talks/urls.py
Custom ordering for the start date
Pass custom URL parameter to the search query
Merge branch 'master' into search-facet-date

* master: (320 commits)
  Reordered event form radio buttons #152
  Reorganise fields in event form #151
  Cleanup template
  Updated URL for topic view -- clashes with skos-suggester web service on our dev machine..
  Added link to maps.ox
  Minimalist Person page showing events associated
  Minimalist browsing per topic
  Event -> add link to speaker page
  Contributors/persons admin: updated style to reflect event, groups
  Person.email not required, hidden #143
  Fixed tests broken after 8c6603e
  EventGroup.group_type defaults to Seminar Series #149
  Updated verbose_name of location_details #153
  Updated help text for autocomplete fields #154
  Speaker -> Speakers, Topic -> Topics #154
  Fixed saving event to index it correctly #132
  Do not display "Save and add another" when editing a talk #135
  Use oxford date without calendar date on event view
  Added 'new' buttons to dashboard pages for Event, EventGroup, Person #75
  Occurence > Timing #150
  ...

Conflicts:
	talks/events/forms.py
	talks/events/views.py
	talks/urls.py
Move everything related to search to a different app
Working faceting
Updated template to not include values that have count = zero
Added module documentation
Optional booking email address as an alternative to URL.
Only allow one of booking email and booking url to be provided when validating form.
Merge branch 'master' into search-facet-date

* master:
  Wait for speaker name field to appear when testing add speaker on the go
  Better user feedback for incorrect speaker add
  PEP8 Fix inline speaker add position
  Added test for 'create speaker on the go'
  Remove modal person form
  Use model validation rather than custom serialised validation
  Reject attempts to deserialise Persons with no name or no bio
  Use placeholder text instead of labels for inline speaker creation - bootstrap labels are fixed width in this case, which doesn't work well for 'Affiliation'
  Now uses optional bio instead of email. Removed remnants of modal speaker add.
  Now passes tests
  Clear fields after adding speaker
  Non-modal (inline) speaker add in event form

Conflicts:
	talks/urls.py
Merge pull request #48 from ox-it/search-facet-date

Search facet on start date
Removed restriction on prevent both booking url and booking email
Updated terminology #148 #166
Merge branch 'master' of github.com:ox-it/talks.ox

* 'master' of github.com:ox-it/talks.ox:
  Added module documentation
  Updated template to not include values that have count = zero
  Working faceting
  Move everything related to search to a different app
  Pass custom URL parameter to the search query
  Custom ordering for the start date
  "Pretty" names for range queries
  Configure facet start date
  PoC facet query "Past talks", "Next seven days", "Future"

Conflicts:
	talks/urls.py
Merge pull request #167 from ox-it/booking-email

Booking email
Merge branch 'master' into event-organisers-and-hosts