diff --git a/LesionTracker/.meteor/.finished-upgraders b/LesionTracker/.meteor/.finished-upgraders
index 3e712bc5a..a541808f2 100644
--- a/LesionTracker/.meteor/.finished-upgraders
+++ b/LesionTracker/.meteor/.finished-upgraders
@@ -13,3 +13,4 @@ notices-for-facebook-graph-api-2
 1.3.0-split-minifiers-package
 1.3.5-remove-old-dev-bundle-link
 1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
diff --git a/LesionTracker/.meteor/packages b/LesionTracker/.meteor/packages
index 1326f3bf7..7a8c5460b 100644
--- a/LesionTracker/.meteor/packages
+++ b/LesionTracker/.meteor/packages
@@ -4,18 +4,18 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-npm-bcrypt@0.8.7
+npm-bcrypt@0.9.1
 
 meteor-base@1.0.4             # Packages every Meteor app needs to have
 mobile-experience@1.0.4       # Packages for a great mobile UX
-mongo@1.1.10                  # The database Meteor supports right now
+mongo@1.1.12                  # The database Meteor supports right now
 blaze-html-templates@1.0.4    # Compile .html files into Meteor Blaze views
 session@1.1.6                 # Client-side reactive dictionary for your app
 jquery@1.11.9                 # Helpful client-side library
 tracker@1.1.0                 # Meteor's client-side reactive programming library
 
-es5-shim@4.6.13               # ECMAScript 5 compatibility for older browsers.
-ecmascript@0.5.7              # Enable ECMAScript2015+ syntax in app code
+es5-shim@4.6.14               # ECMAScript 5 compatibility for older browsers.
+ecmascript@0.5.8              # Enable ECMAScript2015+ syntax in app code
 
 clinical:router
 clinical:extended-api
@@ -36,15 +36,15 @@ cornerstone
 worklist
 viewerbase
 dicomweb
-accounts-base@1.2.9
-accounts-password@1.2.12
+accounts-base@1.2.11
+accounts-password@1.3.0
 
 ian:accounts-ui-bootstrap-3
 twbs:bootstrap
-http@1.2.8
+http@1.2.9
 arsnebula:reactive-promise
-promise@0.8.3
-stylus@2.513.4
+promise@0.8.4
+stylus@2.513.5
 fortawesome:fontawesome
 random@1.0.10
 reactive-var@1.0.10
@@ -58,12 +58,13 @@ check@1.2.3
 aldeed:template-extension@4.0.0
 zuuk:stale-session
 gilbertwat:bootstrap3-daterangepicker
-email@1.1.16
+email@1.1.17
 peppelg:bootstrap-3-modal
 simple:reactive-method
 hangingprotocols
 fastclick@1.0.12
-standard-minifier-css@1.1.8
-standard-minifier-js@1.1.8
+standard-minifier-css@1.2.0
+standard-minifier-js@1.2.0
 johdirr:meteor-git-rev
 u2622:persistent-session
+shell-server
diff --git a/LesionTracker/.meteor/release b/LesionTracker/.meteor/release
index c85944c1d..72980bc2f 100644
--- a/LesionTracker/.meteor/release
+++ b/LesionTracker/.meteor/release
@@ -1 +1 @@
-METEOR@1.4.0.1
+METEOR@1.4.1.1
diff --git a/LesionTracker/.meteor/versions b/LesionTracker/.meteor/versions
index bd51597af..23dedb6c0 100644
--- a/LesionTracker/.meteor/versions
+++ b/LesionTracker/.meteor/versions
@@ -1,5 +1,5 @@
-accounts-base@1.2.9
-accounts-password@1.2.12
+accounts-base@1.2.11
+accounts-password@1.3.0
 aldeed:simple-schema@1.5.3
 aldeed:template-extension@4.0.0
 allow-deny@1.0.5
@@ -8,15 +8,15 @@ anti:gagarin@0.4.11
 anti:i18n@0.4.3
 arsnebula:reactive-promise@0.9.1
 autoupdate@1.3.11
-babel-compiler@6.9.0
-babel-runtime@0.1.10
+babel-compiler@6.9.1
+babel-runtime@0.1.11
 base64@1.0.9
 binary-heap@1.0.9
 blaze@2.1.8
 blaze-html-templates@1.0.4
 blaze-tools@1.0.9
 boilerplate-generator@1.0.9
-caching-compiler@1.1.6
+caching-compiler@1.1.7
 caching-html-compiler@1.0.6
 callback-hook@1.0.9
 check@1.2.3
@@ -32,23 +32,23 @@ clinical:router-location@2.1.0
 clinical:router-middleware-stack@2.1.2
 clinical:router-url@2.1.0
 clinical:theming@0.4.10
-coffeescript@1.2.3
+coffeescript@1.2.4_1
 cornerstone@0.0.1
 ddp@1.2.5
-ddp-client@1.3.0
+ddp-client@1.3.1
 ddp-common@1.2.6
 ddp-rate-limiter@1.0.5
-ddp-server@1.3.9
+ddp-server@1.3.10
 deps@1.0.12
 design@0.0.1
 dicomweb@0.0.1
 diff-sequence@1.0.6
 dimseservice@0.0.1
-ecmascript@0.5.7
-ecmascript-runtime@0.3.12
+ecmascript@0.5.8
+ecmascript-runtime@0.3.14
 ejson@1.0.12
-email@1.1.16
-es5-shim@4.6.13
+email@1.1.17
+es5-shim@4.6.14
 fastclick@1.0.12
 fortawesome:fontawesome@4.5.0
 geojson-utils@1.0.9
@@ -58,7 +58,7 @@ hangingprotocols@0.0.1
 hot-code-push@1.0.4
 html-tools@1.0.10
 htmljs@1.0.10
-http@1.2.8
+http@1.2.9
 ian:accounts-ui-bootstrap-3@1.2.89
 id-map@1.0.8
 insecure@1.0.7
@@ -72,25 +72,25 @@ launch-screen@1.0.12
 lesiontracker@0.0.1
 livedata@1.0.18
 localstorage@1.0.11
-logging@1.1.14
+logging@1.1.15
 mdg:validation-error@0.5.1
-meteor@1.2.16
+meteor@1.2.17
 meteor-base@1.0.4
 meteor-platform@1.2.6
-minifier-css@1.2.13
-minifier-js@1.2.13
+minifier-css@1.2.14
+minifier-js@1.2.14
 minimongo@1.0.17
 mobile-experience@1.0.4
 mobile-status-bar@1.0.12
-modules@0.7.5
-modules-runtime@0.7.5
+modules@0.7.6
+modules-runtime@0.7.6
 momentjs:moment@2.14.4
-mongo@1.1.10
+mongo@1.1.12
 mongo-id@1.0.5
 mrt:moment@2.8.1
-natestrauser:select2@4.0.2
-npm-bcrypt@0.8.7
-npm-mongo@1.5.45
+natestrauser:select2@4.0.3
+npm-bcrypt@0.9.1
+npm-mongo@1.5.49
 observe-sequence@1.0.12
 ohif:core@0.0.1
 ordered-dict@1.0.8
@@ -98,7 +98,7 @@ orthanc-remote@0.0.1
 peppelg:bootstrap-3-modal@1.0.4
 practicalmeteor:chai@2.1.0_1
 practicalmeteor:loglevel@1.2.0_2
-promise@0.8.3
+promise@0.8.4
 random@1.0.10
 rate-limit@1.0.5
 reactive-dict@1.1.8
@@ -110,16 +110,17 @@ rwatts:uuid@0.1.0
 service-configuration@1.0.10
 session@1.1.6
 sha@1.0.8
+shell-server@0.2.1
 silentcicero:jszip@0.0.4
 simple:reactive-method@1.0.2
 spacebars@1.0.12
 spacebars-compiler@1.0.12
 srp@1.0.9
 standard-app-packages@1.0.9
-standard-minifier-css@1.1.8
-standard-minifier-js@1.1.8
-stylus@2.513.4
-templating@1.2.13
+standard-minifier-css@1.2.0
+standard-minifier-js@1.2.0
+stylus@2.513.5
+templating@1.2.14
 templating-tools@1.0.4
 tracker@1.1.0
 twbs:bootstrap@3.3.6
@@ -132,7 +133,7 @@ url@1.0.10
 validatejs@0.0.1
 viewerbase@0.0.1
 wadoproxy@0.0.1
-webapp@1.3.10
+webapp@1.3.11
 webapp-hashing@1.0.9
 worklist@0.0.1
 zuuk:stale-session@1.0.8
diff --git a/OHIFViewer/.meteor/.finished-upgraders b/OHIFViewer/.meteor/.finished-upgraders
index 3e712bc5a..a541808f2 100644
--- a/OHIFViewer/.meteor/.finished-upgraders
+++ b/OHIFViewer/.meteor/.finished-upgraders
@@ -13,3 +13,4 @@ notices-for-facebook-graph-api-2
 1.3.0-split-minifiers-package
 1.3.5-remove-old-dev-bundle-link
 1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
diff --git a/OHIFViewer/.meteor/packages b/OHIFViewer/.meteor/packages
old mode 100755
new mode 100644
index c305d0da9..69073452a
--- a/OHIFViewer/.meteor/packages
+++ b/OHIFViewer/.meteor/packages
@@ -5,20 +5,20 @@
 # but you can also edit it by hand.
 
 twbs:bootstrap
-http@1.2.8
+http@1.2.9
 arsnebula:reactive-promise
-promise@0.8.3
-stylus@2.513.4
+promise@0.8.4
+stylus@2.513.5
 fortawesome:fontawesome
 mrt:moment
 meteor-base@1.0.4
 mobile-experience@1.0.4
-mongo@1.1.10
+mongo@1.1.12
 blaze-html-templates@1.0.4
 session@1.1.6
 jquery@1.11.9
 tracker@1.1.0
-logging@1.1.14
+logging@1.1.15
 reload@1.1.10
 random@1.0.10
 ejson@1.0.12
@@ -29,7 +29,7 @@ dicomweb
 aldeed:simple-schema          # Third party package to deal with schemas
 design
 ohif:core
-ecmascript@0.5.7
+ecmascript@0.5.8
 viewerbase
 worklist
 reactive-var@1.0.10
@@ -38,9 +38,10 @@ hangingprotocols
 reactive-dict@1.1.8
 clinical:router
 fastclick@1.0.12
-standard-minifier-css@1.1.8
-standard-minifier-js@1.1.8
+standard-minifier-css@1.2.0
+standard-minifier-js@1.2.0
 johdirr:meteor-git-rev
 wadoproxy
 aldeed:template-extension
 peppelg:bootstrap-3-modal
+shell-server
diff --git a/OHIFViewer/.meteor/release b/OHIFViewer/.meteor/release
index c85944c1d..72980bc2f 100644
--- a/OHIFViewer/.meteor/release
+++ b/OHIFViewer/.meteor/release
@@ -1 +1 @@
-METEOR@1.4.0.1
+METEOR@1.4.1.1
diff --git a/OHIFViewer/.meteor/versions b/OHIFViewer/.meteor/versions
old mode 100755
new mode 100644
index 8a20cef19..6d529819e
--- a/OHIFViewer/.meteor/versions
+++ b/OHIFViewer/.meteor/versions
@@ -3,15 +3,15 @@ aldeed:template-extension@4.0.0
 allow-deny@1.0.5
 arsnebula:reactive-promise@0.9.1
 autoupdate@1.3.11
-babel-compiler@6.9.0
-babel-runtime@0.1.10
+babel-compiler@6.9.1
+babel-runtime@0.1.11
 base64@1.0.9
 binary-heap@1.0.9
 blaze@2.1.8
 blaze-html-templates@1.0.4
 blaze-tools@1.0.9
 boilerplate-generator@1.0.9
-caching-compiler@1.1.6
+caching-compiler@1.1.7
 caching-html-compiler@1.0.6
 callback-hook@1.0.9
 check@1.2.3
@@ -19,19 +19,19 @@ clinical:router@2.0.19
 clinical:router-location@2.1.0
 clinical:router-middleware-stack@2.1.2
 clinical:router-url@2.1.0
-coffeescript@1.2.3
+coffeescript@1.2.4_1
 cornerstone@0.0.1
 ddp@1.2.5
-ddp-client@1.3.0
+ddp-client@1.3.1
 ddp-common@1.2.6
-ddp-server@1.3.9
+ddp-server@1.3.10
 deps@1.0.12
 design@0.0.1
 dicomweb@0.0.1
 diff-sequence@1.0.6
 dimseservice@0.0.1
-ecmascript@0.5.7
-ecmascript-runtime@0.3.12
+ecmascript@0.5.8
+ecmascript-runtime@0.3.14
 ejson@1.0.12
 fastclick@1.0.12
 fortawesome:fontawesome@4.5.0
@@ -41,7 +41,7 @@ hangingprotocols@0.0.1
 hot-code-push@1.0.4
 html-tools@1.0.10
 htmljs@1.0.10
-http@1.2.8
+http@1.2.9
 id-map@1.0.8
 iron:controller@1.0.12
 iron:core@1.0.11
@@ -51,24 +51,24 @@ johdirr:meteor-git-rev@0.0.4
 jquery@1.11.9
 launch-screen@1.0.12
 livedata@1.0.18
-logging@1.1.14
-mdg:validation-error@0.2.0
-meteor@1.2.16
+logging@1.1.15
+mdg:validation-error@0.5.1
+meteor@1.2.17
 meteor-base@1.0.4
 meteor-platform@1.2.6
-minifier-css@1.2.13
-minifier-js@1.2.13
+minifier-css@1.2.14
+minifier-js@1.2.14
 minimongo@1.0.17
 mobile-experience@1.0.4
 mobile-status-bar@1.0.12
-modules@0.7.5
-modules-runtime@0.7.5
+modules@0.7.6
+modules-runtime@0.7.6
 momentjs:moment@2.14.4
-mongo@1.1.10
+mongo@1.1.12
 mongo-id@1.0.5
 mrt:moment@2.8.1
-natestrauser:select2@4.0.2
-npm-mongo@1.5.45
+natestrauser:select2@4.0.3
+npm-mongo@1.5.49
 observe-sequence@1.0.12
 ohif:core@0.0.1
 ordered-dict@1.0.8
@@ -76,7 +76,7 @@ orthanc-remote@0.0.1
 peppelg:bootstrap-3-modal@1.0.4
 practicalmeteor:chai@2.1.0_1
 practicalmeteor:loglevel@1.2.0_2
-promise@0.8.3
+promise@0.8.4
 random@1.0.10
 reactive-dict@1.1.8
 reactive-var@1.0.10
@@ -85,14 +85,15 @@ retry@1.0.8
 routepolicy@1.0.11
 rwatts:uuid@0.1.0
 session@1.1.6
+shell-server@0.2.1
 silentcicero:jszip@0.0.4
 spacebars@1.0.12
 spacebars-compiler@1.0.12
 standard-app-packages@1.0.9
-standard-minifier-css@1.1.8
-standard-minifier-js@1.1.8
-stylus@2.513.4
-templating@1.2.13
+standard-minifier-css@1.2.0
+standard-minifier-js@1.2.0
+stylus@2.513.5
+templating@1.2.14
 templating-tools@1.0.4
 tracker@1.1.0
 twbs:bootstrap@3.3.6
@@ -102,6 +103,6 @@ url@1.0.10
 validatejs@0.0.1
 viewerbase@0.0.1
 wadoproxy@0.0.1
-webapp@1.3.10
+webapp@1.3.11
 webapp-hashing@1.0.9
 worklist@0.0.1
diff --git a/config/orthancDICOMWeb.json b/config/orthancDICOMWeb.json
index ee2f1a1f2..0e9bba1ba 100644
--- a/config/orthancDICOMWeb.json
+++ b/config/orthancDICOMWeb.json
@@ -4,7 +4,7 @@
       {
         "name": "Orthanc",
         "wadoUriRootNOTE": "either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently",
-        "wadoUriRoot": "http://localhost:8043/wado",
+        "wadoUriRoot": "http://localhost:8042/wado",
         "qidoRoot": "http://localhost:8042/dicom-web",
         "wadoRoot": "http://localhost:8042/dicom-web",
         "qidoSupportsIncludeField": false,
diff --git a/etc/OrthancProxy.js b/etc/OrthancProxy.js
deleted file mode 100644
index be7c16053..000000000
--- a/etc/OrthancProxy.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// This sets up a proxy to work around CORS.
-// See http://chafey.blogspot.be/2014/09/working-around-cors.html
-// For more information
-var http = require('http'),
-    httpProxy = require('http-proxy');
-
-var proxy =  httpProxy.createProxyServer({
-    target: 'http://localhost:8042',
-    auth: 'orthanc:orthanc'
-}).listen(8043);
-
-proxy.on('proxyRes', function(proxyReq, req, res, options) {
-  // add the CORS header to the response
-  res.setHeader('Access-Control-Allow-Origin', '*');
-});
-
-proxy.on('error', function(e) {
-  // suppress errors
-  console.log(e);
-});
diff --git a/etc/dcm4cheCORSproxy.js b/etc/dcm4cheCORSproxy.js
deleted file mode 100644
index d47fbeed3..000000000
--- a/etc/dcm4cheCORSproxy.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// This sets up a proxy to work around CORS.
-// See http://chafey.blogspot.be/2014/09/working-around-cors.html
-// For more information
-var http = require('http'),
-    httpProxy = require('http-proxy');
-
-var proxy =  httpProxy.createProxyServer({
-    target: 'http://localhost:8080',
-    auth: 'user:user'
-}).listen(8043);
-
-proxy.on('proxyRes', function(proxyReq, req, res, options) {
-  // add the CORS header to the response
-  res.setHeader('Access-Control-Allow-Origin', '*');
-});
-
-proxy.on('error', function(e) {
-  // suppress errors
-  console.log(e);
-});
diff --git a/etc/nodeCORSProxy.example b/etc/nodeCORSProxy.example
deleted file mode 100644
index ae50b166e..000000000
--- a/etc/nodeCORSProxy.example
+++ /dev/null
@@ -1,20 +0,0 @@
-// This sets up a proxy to work around CORS.
-// See http://chafey.blogspot.be/2014/09/working-around-cors.html
-// For more information
-var http = require('http'),
-    httpProxy = require('http-proxy');
-
-var proxy =  httpProxy.createProxyServer({
-    target: 'http://localhost:8042',
-    auth: 'orthanc:orthanc'
-}).listen(8042);
-
-proxy.on('proxyRes', function(proxyReq, req, res, options) {
-  // add the CORS header to the response
-  res.setHeader('Access-Control-Allow-Origin', '*');
-});
-
-proxy.on('error', function(e) {
-  // suppress errors
-  console.log(e);
-});
diff --git a/etc/nodeCORSProxy.js b/etc/nodeCORSProxy.js
deleted file mode 100644
index be7c16053..000000000
--- a/etc/nodeCORSProxy.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// This sets up a proxy to work around CORS.
-// See http://chafey.blogspot.be/2014/09/working-around-cors.html
-// For more information
-var http = require('http'),
-    httpProxy = require('http-proxy');
-
-var proxy =  httpProxy.createProxyServer({
-    target: 'http://localhost:8042',
-    auth: 'orthanc:orthanc'
-}).listen(8043);
-
-proxy.on('proxyRes', function(proxyReq, req, res, options) {
-  // add the CORS header to the response
-  res.setHeader('Access-Control-Allow-Origin', '*');
-});
-
-proxy.on('error', function(e) {
-  // suppress errors
-  console.log(e);
-});
diff --git a/etc/setupLocalOrthanc.sh b/etc/setupLocalOrthanc.sh
deleted file mode 100755
index 269371c68..000000000
--- a/etc/setupLocalOrthanc.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-echo "Retrieving docker default machine IP address..."
-MACHINEIP=$(docker-machine ip default)
-echo "Copying nodeCORSProxy.example to nodeCORSProxy.js"
-cp nodeCORSProxy.example nodeCORSProxy.js
-sed -i '' "s/localhost:8042/$MACHINEIP:8042/g" nodeCORSProxy.js
-echo "Installing node http-proxy from npm..."
-npm install http-proxy
-echo "Running proxy server..."
-echo "In a separate tab/terminal, go to /main and run ./bin/orthancDICOMWeb.sh to start the Meteor server"
-node nodeCORSProxy.js