Merge branch 'master' of https://github.com/OHIF/Viewers into feature/i18n-basics

# Conflicts:
#	extensions/ohif-vtk-extension/package.json
#	extensions/ohif-vtk-extension/rollup.config.js
#	extensions/ohif-vtk-extension/yarn.lock
#	package.json
#	src/App.js
#	src/components/Header/Header.js
#	yarn.lock

extensions/ohif-vtk-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-vtk",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "OHIF extension for VTK.js",
   "author": "OHIF",
   "license": "MIT",
@@ -25,7 +25,7 @@
     "dicom-parser": "^1.8.3",
     "hammerjs": "^2.0.8",
     "ohif-core": "^0.3.3",
-    "ohif-i18n": "file:.yalc/ohif-i18n",
+    "@ohif/i18n": "0.0.1-rc-001",
     "prop-types": "^15.6.2",
     "react": "^15.0.0 || ^16.0.0",
     "react-dom": "^15.0.0 || ^16.0.0",
@@ -41,6 +41,7 @@
     "@babel/plugin-transform-runtime": "^7.2.0",
     "@babel/preset-env": "^7.2.3",
     "@babel/preset-react": "^7.0.0",
+    "@ohif/i18n": "0.0.1-rc-001",
     "babel-eslint": "^10.0.1",
     "cross-env": "^5.2.0",
     "eslint": "5.13.0",
@@ -92,6 +93,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.2.0",
+    "@ohif/extension-vtk": "file:.yalc/@ohif/extension-vtk",
     "classnames": "^2.2.6",
     "react-vtkjs-viewport": "^0.0.7"
   }