Changing text messages -> conversations
Standardise - code refs to 'messages' to 'conversations'
Merge branch 'goobertron-rename_messages' into develop