Display the correct noun: "tweet" or "sms" depending on the collection type
Merge remote-tracking branch 'origin/master'