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

src/components/views/groups/GroupMemberTile.js

@@ -63,7 +63,7 @@ export default withMatrixClient(React.createClass({
         return (
             <EntityTile name={name} avatarJsx={av} onClick={this.onClick}
                 suppressOnHover={true} presenceState="online"
-                powerStatus={this.props.member.isAdmin ? EntityTile.POWER_STATUS_ADMIN : null}
+                powerStatus={this.props.member.isPrivileged ? EntityTile.POWER_STATUS_ADMIN : null}
             />
         );
     },

src/groups.js

@@ -36,7 +36,7 @@ export function groupMemberFromApiObject(apiObject) {
         userId: apiObject.user_id,
         displayname: apiObject.displayname,
         avatarUrl: apiObject.avatar_url,
-        isAdmin: apiObject.is_admin,
+        isPrivileged: apiObject.is_privileged,
     };
 }