Merge remote-tracking branch 'origin/develop' into notif_sync

src/components/views/rooms/MessageComposer.js

@@ -319,6 +319,9 @@ module.exports = React.createClass({
         if (isEmote) {
             contentText = contentText.substring(4);
         }
+        else if (contentText[0] === '/') {
+            contentText = contentText.substring(1);   
+        }
 
         var htmlText;
         if (this.markdownEnabled && (htmlText = mdownToHtml(contentText)) !== contentText) {

src/components/views/rooms/RoomHeader.js

@@ -106,7 +106,7 @@ module.exports = React.createClass({
                 // don't display the search count until the search completes and
                 // gives us a non-null searchCount.
                 if (this.props.searchInfo && this.props.searchInfo.searchCount !== null) {
-                    searchStatus = <div className="mx_RoomHeader_searchStatus">&nbsp;({ this.props.searchInfo.searchCount } results)</div>;
+                    searchStatus = <div className="mx_RoomHeader_searchStatus">&nbsp;(~{ this.props.searchInfo.searchCount } results)</div>;
                 }
 
                 name =