Change client side to use the csrf token cookie instead of taking it from the template
Remove delivery_tag and delivery_tag_pool fields from conversation model and fix/kill everything that looked at them.
Fix dialogue test cases that were broken because they alway fails on my machine and I failed to notice that the failure was different.
Merge branch 'develop' into feature/issue-624-clean-up-conversation-model
Allow load_balancing metadata to be submitted via the HTTP_API (see #654) (@vgeddes, @hodgestar).
Merge branch 'develop' into feature/issue-642-use-csrf-token-cookie-instead-of-using-the-token-in-the-template
Merge branch 'feature/issue-642-use-csrf-token-cookie-instead-of-using-the-token-in-the-template' into develop
Order groups by name for client side GroupModel
Redirect to the conversation show page when the conversation edit group page's save button is clicked
Merge branch 'develop' into feature/issue-624-clean-up-conversation-model
Merge branch 'feature/issue-662-clicking-save-button-on-edits-group-page-does-not-direct-back-to-the-show-page' into develop
Fix bug causing imported contacts to be added to an existing group instead of a newly created group
Turn the Conversation model "batches" field into a mandatory "batch" field.
Change contacts tests to ensure we've fixed the bug caused when importing contacts for a new group
Merge branch 'develop' into feature/issue-664-new-contacts-uploaded-via-csv-not-added-to-contact-group
Merge branch 'feature/issue-664-new-contacts-uploaded-via-csv-not-added-to-contact-group' into develop
Add missing csrf token to group contact list page's form
Fix docstring.
Support removing contacts from static groups
Handle newer conversation versions better in migration command.