Clean up some unnecessary delivery_classes in tests.
Extract delivery_class from get_opted_in_bunches.
Use transport_type instead of delivery_class for subscription app.
Cleaner way to use transport_type instead of delivery_class.
Fixed the choice state cancel button (StateView was doing an unnessary 'on model change, render', which was being reached before endpoint collections' 'on model remove, render' events
Use model.set() with {remove: true} instead of a clear() and set() when cancelling dialogue state model changes. Using clear() causes Backbone.relational to clear all relations associated to a model being removed, causing connections to disappear when endpoints are temporarily removed
Use model.set() without any options when cancelling dialogue state changes, we can rely on the Backbone.relational defaults
Update app worker tests to use new-style conversation starting (for the most part) and fix reliance on tags and delivery class where necessary.
Rename conversation.start() to conversation.old_start() and update the world.
Sith, not ninja
Merge branch 'feature/issue-439-choices-cant-be-added-to-a-dialogue-choice-state-after-a-reset' into develop-frontend
Rename new_start() to start().
Merge branch 'develop-frontend' into feature/issue-444-move-grid-setup-from-dialoguediagramview-to-dialoguestatecollection
Merge branch 'develop-frontend' into feature/issue-441-dialogue-states-should-only-be-moveable-if-they-have-no-connections-attached
Merge branch 'develop-frontend' into feature/issue-445-cancel-button-is-broken-for-choicestateeditview
Merge branch 'develop-frontend' into feature/issue-443-users-should-only-be-able-to-connect-exit-endpoints-to-entry-endpoints-on-the-dialogue-screen

Conflicts:
	go/base/static/js/src/campaign/dialogue/diagram.js
	go/base/static/js/src/campaign/dialogue/states/end.js
	go/base/static/js/src/campaign/dialogue/states/freetext.js
Merge branch 'develop-frontend' into feature/issue-442-users-should-be-warned-before-a-dialogue-state-is-reset
Specify native tracebacks when invoking py.test.
Merge branch 'develop' into develop-frontend
Merge branch 'feature/issue-440-reduce-reliance-on-delivery_class' into develop