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-i18n/src/locales/en/Header.json

@@ -1,8 +1,8 @@
 {
-  "preferences": "Preferences",
-  "options": "Options",
-  "about": "About",
-  "back_to_viewer": "Back to Viewer",
-  "study_list": "Study list",
-  "research_use": "INVESTIGATIONAL USE ONLY"
+  "INVESTIGATIONAL USE ONLY": "Preferences",
+  "Options": "Options",
+  "About": "About",
+  "Preferences": "Preferences",
+  "Study list": "Study list",
+  "Back to Viewer": "Back to Viewer"
 }

extensions/ohif-i18n/src/locales/en/UK/Header.json

@@ -1,3 +1,3 @@
 {
-  "research_use": "INVESTIGATIONAL PURPOSES ONLY"
+  "About": "Info"
 }

extensions/ohif-i18n/src/locales/en/US/Header.json

@@ -1,4 +1,3 @@
 {
-  "options": "Options",
-  "about": "About"
+  "About": "About"
 }

extensions/ohif-i18n/src/locales/es/AR/Header.json

@@ -1,3 +1,3 @@
 {
-  "research_use": "SOLO USO DE DESAROLLO"
+  "INVESTIGATIONAL USE ONLY": "SOLO USO DE DESAROLLO"
 }

extensions/ohif-i18n/src/locales/es/Header.json

@@ -1,7 +1,8 @@
 {
-  "research_use": "SOLO USO DE INVESTIGACIÓN",
-  "options": "Opciones",
-  "about": "Sobre",
-  "preferences": "Preferencias",
-  "study_list": "Lista de estudio"
+  "INVESTIGATIONAL USE ONLY": "SOLO USO DE INVESTIGACIÓN",
+  "Options": "Opciones",
+  "About": "Sobre",
+  "Preferences": "Preferencias",
+  "Study list": "Lista de estudio",
+  "Back to Viewer": "Back to Viewer"
 }

extensions/ohif-i18n/src/locales/es/MX/Header.json

@@ -1,3 +1,3 @@
 {
-  "Opciones": "Elecciones"
+  "INVESTIGATIONAL USE ONLY": "SOLO USO DE INVESTIGACIÓN"
 }