Merge branch 'master' into heroku

* master:
  linting

Author: Erik Rasmussen

src/components/WidgetForm.js

@@ -76,7 +76,7 @@ export default class WidgetForm extends Component {
           <button className="btn btn-success"
                   onClick={handleSubmit(() => save(data))}
                   disabled={pristine || invalid || submitting}>
-            <i className={'fa '+(submitting ? 'fa-cog fa-spin' : 'fa-cloud')}/> Save
+            <i className={'fa ' + (submitting ? 'fa-cog fa-spin' : 'fa-cloud')}/> Save
           </button>
           {saveError && <div className="text-danger">{saveError}</div>}
         </td>

src/views/Widgets.js

@@ -99,7 +99,7 @@ class Widgets extends Component {
   }
 
   handleEdit(widget) {
-    const {editStart, initializeWithKey} = this.props;
+    const {editStart, initializeWithKey} = this.props; // eslint-disable-line no-shadow
     return () => {
       initializeWithKey('widgetForm', widget.id, widget);
       editStart(String(widget.id));