Merge branches 'develop' and 't3chguy/report_event' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/report_event

 Conflicts:

	src/i18n/strings/en_EN.json

src/components/views/context_menus/GenericElementContextMenu.js

@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import React from 'react';
 import PropTypes from 'prop-types';
 
@@ -26,7 +24,7 @@ import PropTypes from 'prop-types';
 
 
 export default class GenericElementContextMenu extends React.Component {
-    static PropTypes = {
+    static propTypes = {
         element: PropTypes.element.isRequired,
         // Function to be called when the parent window is resized
         // This can be used to reposition or close the menu on resize and

src/components/views/context_menus/GenericTextContextMenu.js

@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import React from 'react';
 import PropTypes from 'prop-types';
 
 export default class GenericTextContextMenu extends React.Component {
-    static PropTypes = {
+    static propTypes = {
         message: PropTypes.string.isRequired,
     };
 

src/components/views/context_menus/MessageContextMenu.js

@@ -18,6 +18,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import createReactClass from 'create-react-class';
 import {EventStatus} from 'matrix-js-sdk';
 
 import MatrixClientPeg from '../../../MatrixClientPeg';
@@ -34,7 +35,7 @@ function canCancel(eventStatus) {
     return eventStatus === EventStatus.QUEUED || eventStatus === EventStatus.NOT_SENT;
 }
 
-module.exports = React.createClass({
+module.exports = createReactClass({
     displayName: 'MessageContextMenu',
 
     propTypes: {

src/components/views/context_menus/RoomTileContextMenu.js

@@ -18,8 +18,9 @@ limitations under the License.
 
 import Promise from 'bluebird';
 import React from 'react';
-import classNames from 'classnames';
 import PropTypes from 'prop-types';
+import createReactClass from 'create-react-class';
+import classNames from 'classnames';
 import sdk from '../../../index';
 import { _t, _td } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
@@ -31,7 +32,7 @@ import Modal from '../../../Modal';
 import RoomListActions from '../../../actions/RoomListActions';
 import RoomViewStore from '../../../stores/RoomViewStore';
 
-module.exports = React.createClass({
+module.exports = createReactClass({
     displayName: 'RoomTileContextMenu',
 
     propTypes: {