slightly better looking than before.
No more make_message_options().
Remove user_api.msg_options().
Merge branch 'feature/issue-471-remove-make_message_options' into develop
Backport some changes from develop-frontend.
renamed links in left hand side.
change `start` and `stop` in show page.
- added label to keyword field
- change description to conversation description
increase padding in conversation wizard page.
fixed #476, removes assign to group.
fixed #479, navigation changes.
Merge branch 'develop' into develop-frontend

Conflicts:
	go/apps/bulk_message/tests/test_new_views.py
	go/apps/bulk_message/tests/test_views.py
	go/apps/sequential_send/tests/test_views.py
	go/apps/subscription/tests/test_views.py
	go/apps/surveys/tests/test_new_views.py
	go/apps/surveys/tests/test_views.py
	go/conversation/base.py
	go/conversation/conversation_views.py
	go/vumitools/conversation/utils.py
removed account settings section on right side.
Allow conversation to be stopped (with appropriate warning) while in transitional state.
GridView attempt 2
Merge branch 'feature/issue-481-allow-stop-in-transitional-state' into develop-frontend
Change the dialogue screen to work with the new DialogueView
Use listenTo() instead of on() for listening for grid reorder events in DialogueStateCollection
Fix dialogue state drag disabling for connected states (the current workaround for the jquery ui sortable bug does not work with the new GridView)
Change dialogue state connection color on hover