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

src/components/structures/RoomDirectory.js

@@ -409,7 +409,7 @@ module.exports = React.createClass({
 
             perms = null;
             if (guestRead || guestJoin) {
-                perms = <div className="mx_RoomDirectory_perms">{guestRead} {guestJoin}</div>;
+                perms = <div className="mx_RoomDirectory_perms">{guestRead}{guestJoin}</div>;
             }
 
             var topic = rooms[i].topic || '';

src/skins/vector/css/vector-web/structures/_RoomDirectory.scss

@@ -100,6 +100,7 @@ limitations under the License.
     display: inline;
     padding-left: 5px;
     padding-right: 5px;
+    margin-right: 5px;
     height: 15px;
     border-radius: 11px;
     background-color: $plinth-bg-color;