diff --git a/app/.meteor/.finished-upgraders b/app/.meteor/.finished-upgraders
index 910574ce..4538749a 100644
--- a/app/.meteor/.finished-upgraders
+++ b/app/.meteor/.finished-upgraders
@@ -15,3 +15,4 @@ notices-for-facebook-graph-api-2
 1.4.1-add-shell-server-package
 1.4.3-split-account-service-packages
 1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base
diff --git a/app/.meteor/packages b/app/.meteor/packages
index fc688ae4..d28447d3 100644
--- a/app/.meteor/packages
+++ b/app/.meteor/packages
@@ -3,7 +3,7 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-accounts-password@1.5.0
+accounts-password@1.5.1
 accounts-ui@1.3.0
 random@1.1.0
 dburles:collection-helpers
@@ -23,34 +23,34 @@ email@1.2.3
 meteorhacks:subs-manager
 chuangbo:marked
 reywood:iron-router-ga
-meteor-base@1.3.0
+meteor-base@1.4.0
 mobile-experience@1.0.5
-mongo@1.4.2
+mongo@1.5.0
 blaze-html-templates
 session@1.1.7
 jquery@1.11.10
-tracker@1.1.3
-logging@1.1.19
+tracker@1.2.0
+logging@1.1.20
 reload@1.2.0
 ejson@1.1.0
 spacebars
-check@1.3.0
+check@1.3.1
 useraccounts:iron-routing
 wizonesolutions:canonical
-standard-minifier-js@2.3.1
+standard-minifier-js@2.3.4
 shell-server@0.3.1
 seba:minifiers-autoprefixer
 nikogosovd:multiple-uihooks
 templates:array
-ecmascript@0.10.6
-es5-shim@4.7.0
+ecmascript@0.11.1
+es5-shim@4.8.0
 differential:vulcanize
 reactive-dict@1.2.0
 percolate:synced-cron
 ongoworks:speakingurl
 service-configuration@1.0.11
 google-config-ui@1.0.0
-dynamic-import@0.3.0
+dynamic-import@0.4.0
 ddp-rate-limiter@1.0.7
-rate-limit@1.0.8
+rate-limit@1.0.9
 iron:router
diff --git a/app/.meteor/release b/app/.meteor/release
index 011385b2..04fe8b4f 100644
--- a/app/.meteor/release
+++ b/app/.meteor/release
@@ -1 +1 @@
-METEOR@1.6.1.1
+METEOR@1.7.0.3
diff --git a/app/.meteor/versions b/app/.meteor/versions
index 8794a573..e5c754a6 100644
--- a/app/.meteor/versions
+++ b/app/.meteor/versions
@@ -10,17 +10,17 @@ aldeed:schema-deny@1.1.0
 aldeed:schema-index@1.1.1
 aldeed:simple-schema@1.5.4
 allow-deny@1.1.0
-autoupdate@1.4.0
-babel-compiler@7.0.9
+autoupdate@1.4.1
+babel-compiler@7.1.1
 babel-runtime@1.2.2
 base64@1.0.11
 binary-heap@1.0.10
 blaze@2.3.2
 blaze-html-templates@1.1.2
 blaze-tools@1.0.10
-boilerplate-generator@1.4.0
+boilerplate-generator@1.5.0
 caching-compiler@1.1.12
-caching-html-compiler@1.1.2
+caching-html-compiler@1.1.3
 callback-hook@1.1.0
 check@1.3.1
 chuangbo:marked@0.3.5_1
@@ -28,22 +28,22 @@ coffeescript@1.0.17
 dburles:collection-helpers@1.1.0
 dburles:mongo-collection-instances@0.3.5
 ddp@1.4.0
-ddp-client@2.3.2
+ddp-client@2.3.3
 ddp-common@1.4.0
 ddp-rate-limiter@1.0.7
-ddp-server@2.1.2
+ddp-server@2.2.0
 deps@1.0.12
 diff-sequence@1.1.0
 differential:vulcanize@3.0.0
-dynamic-import@0.3.0
-ecmascript@0.10.9
-ecmascript-runtime@0.5.0
-ecmascript-runtime-client@0.6.2
-ecmascript-runtime-server@0.5.0
+dynamic-import@0.4.1
+ecmascript@0.11.1
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.7.1
+ecmascript-runtime-server@0.7.0
 ecwyne:mathjs@0.25.0
 ejson@1.1.0
 email@1.2.3
-es5-shim@4.7.3
+es5-shim@4.8.0
 geojson-utils@1.0.10
 google-config-ui@1.0.0
 google-oauth@1.2.5
@@ -69,23 +69,24 @@ localstorage@1.2.0
 logging@1.1.20
 matb33:collection-hooks@0.8.4
 mdg:validation-error@0.5.1
-meteor@1.8.6
-meteor-base@1.3.0
+meteor@1.9.2
+meteor-base@1.4.0
 meteorhacks:subs-manager@1.6.4
 minifier-css@1.3.1
 minifier-js@2.3.5
 minimongo@1.4.4
 mobile-experience@1.0.5
 mobile-status-bar@1.0.14
-modules@0.11.8
-modules-runtime@0.9.2
+modern-browsers@0.1.2
+modules@0.12.2
+modules-runtime@0.10.2
 momentjs:moment@2.22.2
-mongo@1.4.7
+mongo@1.5.1
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
 nikogosovd:multiple-uihooks@0.1.8
 npm-bcrypt@0.9.3
-npm-mongo@2.2.34
+npm-mongo@3.0.11
 oauth@1.2.3
 oauth2@1.2.0
 observe-sequence@1.0.16
@@ -93,7 +94,7 @@ ongoworks:speakingurl@9.0.0
 ordered-dict@1.1.0
 percolate:migrations@0.9.8
 percolate:synced-cron@1.3.2
-promise@0.10.2
+promise@0.11.1
 raix:eventemitter@0.1.3
 random@1.1.0
 rate-limit@1.0.9
@@ -104,13 +105,11 @@ retry@1.1.0
 reywood:iron-router-ga@0.7.1
 routepolicy@1.0.13
 seba:minifiers-autoprefixer@1.0.1
-server-render@0.3.1
 service-configuration@1.0.11
 session@1.1.7
 sha@1.0.9
 shell-server@0.3.1
-shim-common@0.1.0
-socket-stream-client@0.1.0
+socket-stream-client@0.2.2
 softwarerero:accounts-t9n@1.3.11
 spacebars@1.0.15
 spacebars-compiler@1.1.3
@@ -123,14 +122,14 @@ templating@1.3.2
 templating-compiler@1.3.3
 templating-runtime@1.3.2
 templating-tools@1.1.2
-tracker@1.1.3
+tracker@1.2.0
 ui@1.0.13
 underscore@1.0.10
 url@1.2.0
 useraccounts:core@1.14.2
 useraccounts:iron-routing@1.14.2
 useraccounts:polymer@1.14.2
-webapp@1.5.0
+webapp@1.6.2
 webapp-hashing@1.0.9
 wizonesolutions:canonical@0.0.5
 zimme:collection-behaviours@1.1.3
diff --git a/app/package-lock.json b/app/package-lock.json
index 98e851f0..e5c83ad5 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -100,6 +100,11 @@
       "resolved": "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz",
       "integrity": "sha1-54dqB23rgTf30GUl3F6MZtuC8oo="
     },
+    "buffer-from": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz",
+      "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="
+    },
     "builtin-modules": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
@@ -202,6 +207,11 @@
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
       "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
     },
+    "fibers": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fibers/-/fibers-2.0.2.tgz",
+      "integrity": "sha512-HfVRxhYG7C8Jl9FqtrlElMR2z/8YiLQVDKf67MLY25Ic+ILx3ecmklfT1v3u+7P5/4vEFjuxaAFXhr2/Afwk5g=="
+    },
     "find-up": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
@@ -1826,6 +1836,20 @@
       "version": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+    },
+    "source-map-support": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz",
+      "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
+      "requires": {
+        "buffer-from": "1.1.0",
+        "source-map": "0.6.1"
+      }
+    },
     "spdx-correct": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
@@ -2058,6 +2082,11 @@
         }
       }
     },
+    "underscore": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+      "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
+    },
     "validate-npm-package-license": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz",
diff --git a/app/package.json b/app/package.json
index 5c8deae7..b24f5d75 100644
--- a/app/package.json
+++ b/app/package.json
@@ -17,7 +17,10 @@
     "bcrypt": "^1.0.3",
     "bower": "^1.7.9",
     "core-js": "^2.5.7",
+    "fibers": "^2.0.2",
     "meteor-node-stubs": "^0.3.3",
-    "qrcode": "^1.2.0"
+    "qrcode": "^1.2.0",
+    "source-map-support": "^0.5.6",
+    "underscore": "^1.9.1"
   }
 }