Merge branch 'master' into greenkeeper/eslint-4.5.0

package.json

@@ -44,7 +44,7 @@
     "enzyme": "^2.8.2",
     "eslint": "^4.5.0",
     "eslint-config-airbnb": "^15.0.1",
-    "eslint-config-edx": "^3.0.0",
+    "eslint-config-edx": "^4.0.0",
     "eslint-import-resolver-webpack": "^0.8.1",
     "eslint-plugin-jsx-a11y": "^5.1.0",
     "eslint-plugin-react": "^7.1.0",

src/CheckBox/README.md

@@ -9,7 +9,7 @@ The following parameters should be passed into every checkbox component:
 The following parameters can optionally be passed into a checkbox component:
 * `checked` (`Boolean`): `true` if the default state should be checked, `false` otherwise
 * `disabled` (`Boolean`): `true` if the checkbox should be disabled, `false` otherwise
-* `onChangeState`: function to be called when the checkbox changes state
+* `onChange`: function to be called when the checkbox changes state
 
 The implementation of the checkbox contains the following functions:
 * `constructor()`: The constructor sets the `id` for the checkbox and sets whether the initial state should be checked or unchecked