Merge branch 'master' into user-invite

bower.json

@@ -19,7 +19,7 @@
     "strophe.roster": "https://raw.github.com/strophe/strophejs-plugins/b1f364eb6e854ffe844c57add38e885cfeb9b498/roster/strophe.roster.js",
     "strophe.vcard": "https://raw.github.com/strophe/strophejs-plugins/f5c9e16b463610d501591452cded0359f53aae48/vcard/strophe.vcard.js",
     "strophe.disco": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/disco/strophe.disco.js",
-    "strophe.muc": "https://raw.github.com/strophe/strophejs-plugins/c90621f7bad481d2892073df3fb091c937ea71d7/muc/strophe.muc.js",
+    "strophe.muc": "https://raw.githubusercontent.com/strophe/strophejs-plugins/84e703f9ac8329a04c1dcbfd32ea8c753783a912/muc/strophe.muc.js",
     "otr": "0.2.12",
     "crypto-js-evanvosberg": "~3.1.2",
     "almond": "~0.2.9",

docs/CHANGES.rst

 Changelog
 =========
 
+0.8.1 (Unreleased)
+------------------
+
+* #216 Contacts tab empty when using xhr_user_search. [hcderaad and jcbrand]
+
 0.8.1 (2014-08-23)
 ------------------
 

src/templates.js

@@ -35,6 +35,7 @@ define("converse-templates", [
     "tpl!src/templates/roster",
     "tpl!src/templates/roster_item",
     "tpl!src/templates/select_option",
+    "tpl!src/templates/search_contact",
     "tpl!src/templates/status_option",
     "tpl!src/templates/toggle_chats",
     "tpl!src/templates/toolbar",
@@ -77,9 +78,10 @@ define("converse-templates", [
         roster:                 arguments[33],
         roster_item:            arguments[34],
         select_option:          arguments[35],
-        status_option:          arguments[36],
-        toggle_chats:           arguments[37],
-        toolbar:                arguments[38],
-        trimmed_chat:           arguments[39]
+        search_contact:         arguments[36],
+        status_option:          arguments[37],
+        toggle_chats:           arguments[38],
+        toolbar:                arguments[39],
+        trimmed_chat:           arguments[40]
     };
 });