Merge remote-tracking branch 'origin/develop' into rav/context

lib/models/room.js

@@ -895,6 +895,17 @@ Room.prototype.addReceipt = function(event) {
     this.emit("Room.receipt", event, this);
 };
 
+/**
+ * Add a temporary local-echo receipt to the room to reflect in the
+ * client the fact that we've sent one.
+ * @param {string} userId The user ID if the receipt sender
+ * @param {MatrixEvent} e The event that is to be acknowledged
+ * @param {string} receiptType The type of receipt
+ */
+Room.prototype._addLocalEchoReceipt = function(userId, e, receiptType) {
+    this.addReceipt(synthesizeReceipt(userId, e, receiptType));
+};
+
 /**
  * Update the room-tag event for the room.  The previous one is overwritten.
  * @param {MatrixEvent} event the m.tag event