merge with master

clientapp/models/contact.js

@@ -53,6 +53,15 @@ module.exports = HumanModel.define({
                 return this.name || this.jid;
             }
         },
+        displayUnreadCount: {
+            deps: ['unreadCount'],
+            fn: function () {
+                if (this.unreadCount > 0) {
+                    return this.unreadCount.toString();
+                }
+                return '';
+            }
+        },
         formattedTZO: {
             deps: ['timezoneOffset', 'displayName'],
             fn: function () {

clientapp/models/message.js

@@ -45,7 +45,6 @@ module.exports = HumanModel.define({
             deps: ['created'],
             fn: function () {
                 if (this.created) {
-                    console.log(this.created);
                     var month = this.created.getMonth();
                     var day = this.created.getDate();
                     var hour = this.created.getHours();

clientapp/views/contactListItem.js

@@ -18,7 +18,7 @@ module.exports = HumanView.extend({
     textBindings: {
         displayName: '.name',
         status: '.status',
-        unreadCount: '.unread'
+        displayUnreadCount: '.unread'
     },
     srcBindings: {
         avatar: '.avatar'