Merge branch 'master' into develop

# Conflicts:
#	package.json

Author: johniak

package.json

@@ -56,7 +56,7 @@
     "react-art": "^16.6.3",
     "react-dev-utils": "^6.1.1",
     "react-dom": "^16.6.3",
-    "react-native-web": "^0.9.8",
+    "react-native-web": "0.9.9",
     "shallowequal": "1.1.0",
     "uuid": "3.3.2"
   },