fix regression caused by updating backbone.js without updating changed parameters
Merge pull request #4747 from Raven24/fix_aspect_stream

fix regression caused by updating backbone.js in aspect stream
Changing text messages -> conversations
Standardise - code refs to 'messages' to 'conversations'
Merge branch 'goobertron-rename_messages' into develop
Fix bugs introduced by #4754
Merge pull request #4770 from svbergerem/fix-spv-4754

Fix bugs introduced by #4754