Fix up conversation lifecycle buttons and views.
Merge branch 'develop-frontend' into feature/issue-428-conversation-lifecycle-ui

Conflicts:
	go/vumitools/conversation/utils.py
Fix app view tests.
Replace TODO with a different TODO.
Merge branch 'develop-frontend' into feature/issue-431-more-channel-views
Better channel views.