Merge branch 'master' into development

Jeffrey Lanters · web-flow · commit 07d1ea13915b · 2018-01-25T19:57:33.000+01:00
diff --git a/package.json b/package.json
@@ -34,4 +34,4 @@
     "babel-preset-env": "1.6.1",
     "babel-preset-react": "6.24.1"
   }
-}
+}
