Use 'state1' when testing DialogueStateEditView's type resetting action
Merge branch 'develop-frontend' of github.com:praekelt/vumi-go into develop-frontend