Merge remote-tracking branch 'origin/master'

Author: enriquecaballero

package.json

@@ -55,7 +55,7 @@
     "husky": "^0.13.3",
     "jest": "^20.0.1",
     "lint-staged": "^3.4.2",
-    "prettier-eslint-cli": "^3.4.3",
+    "prettier-eslint-cli": "^4.0.1",
     "semantic-release": "^6.3.6",
     "validate-commit-msg": "^2.12.1",
     "webpack": "^2.3.1"