Merge branch 'develop' into fix-114

Author: Marlow Payne

CHANGELOG

@@ -1,5 +1,6 @@
 2.5.2
     - Fix #114 by removing invalid options from CSSComb config file
+    - Add a React rule to make sure propTypes are ordered, required ones declared first and callbacks (e.g. onChange) declared last.
     - Update ES6 indent rule on switch statements
     - Add ignore patterns for unused vars/args to the React configuration
     - Ignore non-JS files and node_modules in the ES6 import module

es6/mobify-es6-react.yml

@@ -25,6 +25,10 @@ rules:
   react/no-string-refs: error
   react/prefer-es6-class: error
   react/prefer-stateless-function: error
+  react/sort-prop-types:
+    - error
+    - callbacksLast: true
+      requiredFirst: true
 
   # JSX formatting preferences
   react/self-closing-comp: error