Merge branch 'develop' of github.com:praekelt/vumi-go into develop
contact_key -> key
update_extra, update_subscription -> update_extras, update_subscriptions
Update docstrings for update_extras and update_subscription
Add contact field to all contact resource api method replies
missing conversation_key when sending token url (thanks @jerith)
fix test for earlier missing conversation_key fix (thanks @jerith)
Create routing table entries when passing a batch_id to ConversationWrapper.start().
inserted the old large logo again.
placed logo into app page.
renamed .html templates.
`Let there be no more reference to recipients` he said... And it was so.
changed app menu name.
Merge branch 'develop-frontend' into feature/issue-255-client-side-code-needs-to-be-reorganised
renamed recipients.
Merge branch 'develop-frontend' into feature/rename-recipients-to-contacts
fixing bug where we crash if menu is incomplete + test
Merge branch 'develop' into feature/issue-253-contacts-resource-api-needs-fixing
Merge branch 'feature/issue-253-contacts-resource-api-needs-fixing' into develop
Merge branch 'feature/issue-254-fix-confirm-start-routing' into develop