Merge remote-tracking branch 'matrix-org/develop' into travis/presence

Signed-off-by: Travis Ralston <travpc@gmail.com>

src/components/views/avatars/BaseAvatar.js

@@ -110,7 +110,7 @@ module.exports = React.createClass({
 
         let idx = 0;
         const initial = name[0];
-        if ((initial === '@' || initial === '#') && name[1]) {
+        if ((initial === '@' || initial === '#' || initial === '+') && name[1]) {
             idx++;
         }
 

src/components/views/avatars/GroupAvatar.js

@@ -28,6 +28,7 @@ export default React.createClass({
         width: PropTypes.number,
         height: PropTypes.number,
         resizeMethod: PropTypes.string,
+        onClick: PropTypes.func,
     },
 
     getDefaultProps: function() {