diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 51b1b8ba..fbacf9b0 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -134,7 +134,8 @@
       "integrity": "sha1-HAPA8PaBvJRYcoaMPbLthLvCFXE="
     },
     "angular-intro.js": {
-      "version": "github:appirio-tech/angular-intro.js#81610d6c3f03437d5cc38211482d43385e2d7be9"
+      "version": "github:appirio-tech/angular-intro.js#81610d6c3f03437d5cc38211482d43385e2d7be9",
+      "from": "github:appirio-tech/angular-intro.js#81610d6c3f03437d5cc38211482d43385e2d7be9"
     },
     "angular-jwt": {
       "version": "0.0.9",
@@ -268,6 +269,11 @@
             "lodash": "3.10.1"
           },
           "dependencies": {
+            "bluebird": {
+              "version": "3.5.0",
+              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+              "integrity": "sha512-3LE8m8bqjGdoxfvf71yhFNrUcwy3NLy00SAo+b6MfJ8l+Bc2DzQ7mUHwX6pjK2AxfgV+YfsjCeVW3T5HLQTBsQ=="
+            },
             "lodash": {
               "version": "3.10.1",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
@@ -375,6 +381,7 @@
     },
     "appirio-tech-react-components": {
       "version": "github:appirio-tech/react-components#25a102b55c1769fe2b42a222d37359f09dc24763",
+      "from": "github:appirio-tech/react-components#25a102b55c1769fe2b42a222d37359f09dc24763",
       "requires": {
         "appirio-styles": "0.0.26",
         "appirio-tech-api-schemas": "5.0.70",
@@ -653,7 +660,8 @@
       },
       "dependencies": {
         "qs": {
-          "version": "git+https://github.com/jfromaniello/node-querystring.git#5d96513991635e3e22d7aa54a8584d6ce97cace8"
+          "version": "git+https://github.com/jfromaniello/node-querystring.git#5d96513991635e3e22d7aa54a8584d6ce97cace8",
+          "from": "git+https://github.com/jfromaniello/node-querystring.git#5d96513991635e3e22d7aa54a8584d6ce97cace8"
         }
       }
     },
@@ -1684,9 +1692,9 @@
       }
     },
     "bluebird": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-      "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.2.tgz",
+      "integrity": "sha512-NNHWKNa8vvPmSmHigyrPxq4JFUrkXoGBEAJqZTgZoV62Nr551f89oH2+P8s8NIpgjl6SkV0drNeXiKAeVXyjVA=="
     },
     "blueimp-tmpl": {
       "version": "2.5.7",
@@ -3125,6 +3133,12 @@
           "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
           "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
           "dev": true
+        },
+        "tapable": {
+          "version": "0.1.10",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+          "integrity": "sha512-jX8Et4hHg57mug1/079yitEKWGB3LCwoxByLsNim89LABq8NqgiX+6iYVOsq0vX8uJHkU+DZ5fnq95f800bEsQ==",
+          "dev": true
         }
       }
     },
@@ -3292,6 +3306,12 @@
           "integrity": "sha1-W28VR/TRAuZw4UDFCb5ncdautUk=",
           "dev": true
         },
+        "estraverse": {
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
+          "integrity": "sha512-FpCjJDfmo3vsc/1zKSeqR5k42tcIhxFIlvq+h9j0fO2q/h2uLKyweq7rYJ+0CoVvrGQOxIS5wyBrW/+vF58BUQ==",
+          "dev": true
+        },
         "esutils": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz",
@@ -3376,6 +3396,12 @@
           "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz",
           "integrity": "sha1-32kbkxCIlAKuspzAZnCMVmkLhUs=",
           "dev": true
+        },
+        "estraverse": {
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
+          "integrity": "sha512-FpCjJDfmo3vsc/1zKSeqR5k42tcIhxFIlvq+h9j0fO2q/h2uLKyweq7rYJ+0CoVvrGQOxIS5wyBrW/+vF58BUQ==",
+          "dev": true
         }
       }
     },
@@ -3415,10 +3441,9 @@
       }
     },
     "estraverse": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
-      "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=",
-      "dev": true
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.0.tgz",
+      "integrity": "sha512-oczetKWPj5mF6hd8/g9tvdUtGHsJdTVwRYRpLVy68CCoJGVE2uWKfmjHEVzx7SEuDGFaUlYbaecePMlC7pVaIQ=="
     },
     "estraverse-fb": {
       "version": "1.3.2",
@@ -4360,6 +4385,11 @@
         "toposort": "1.0.3"
       },
       "dependencies": {
+        "bluebird": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+          "integrity": "sha512-3LE8m8bqjGdoxfvf71yhFNrUcwy3NLy00SAo+b6MfJ8l+Bc2DzQ7mUHwX6pjK2AxfgV+YfsjCeVW3T5HLQTBsQ=="
+        },
         "camel-case": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
@@ -5348,6 +5378,14 @@
         "socket.io": "1.7.4",
         "source-map": "0.4.4",
         "useragent": "2.2.1"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+          "integrity": "sha512-3LE8m8bqjGdoxfvf71yhFNrUcwy3NLy00SAo+b6MfJ8l+Bc2DzQ7mUHwX6pjK2AxfgV+YfsjCeVW3T5HLQTBsQ==",
+          "dev": true
+        }
       }
     },
     "karma-chai": {
@@ -6075,11 +6113,11 @@
       "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
     },
     "moment-timezone": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz",
-      "integrity": "sha1-mc5cfYJyYusPH3AgRBd/YHRde5A=",
+      "version": "0.5.35",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.35.tgz",
+      "integrity": "sha512-cY/pBOEXepQvlgli06ttCTKcIf8cD1nmNwOKQQAdHBqYApQSpAqotBMX0RJZNgMp6i0PlZuf1mFtnlyEkwyvFw==",
       "requires": {
-        "moment": "2.18.1"
+        "moment": ">= 2.9.0"
       }
     },
     "ms": {
@@ -9466,10 +9504,9 @@
       "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
     },
     "tapable": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
-      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
-      "dev": true
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz",
+      "integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg=="
     },
     "tar": {
       "version": "2.2.1",
@@ -9484,6 +9521,7 @@
     },
     "tc-accounts": {
       "version": "git+https://github.com/appirio-tech/accounts-app.git#fb214bc1d9fe889ae27d47e51526db226822991c",
+      "from": "git+https://github.com/appirio-tech/accounts-app.git#fb214bc1d9fe889ae27d47e51526db226822991c",
       "requires": {
         "angucomplete-alt": "2.5.0",
         "angular": "1.6.5",
@@ -9691,6 +9729,7 @@
     },
     "topcoder-app-r": {
       "version": "git+https://github.com/appirio-tech/topcoder-app-r.git#d74851b03d031bb4a427626033eee2436e5915f8",
+      "from": "git+https://github.com/appirio-tech/topcoder-app-r.git#d74851b03d031bb4a427626033eee2436e5915f8",
       "requires": {
         "appirio-styles": "0.0.30",
         "classnames": "2.2.5",
@@ -10223,6 +10262,12 @@
             "has-flag": "1.0.0"
           }
         },
+        "tapable": {
+          "version": "0.1.10",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+          "integrity": "sha512-jX8Et4hHg57mug1/079yitEKWGB3LCwoxByLsNim89LABq8NqgiX+6iYVOsq0vX8uJHkU+DZ5fnq95f800bEsQ==",
+          "dev": true
+        },
         "uglify-js": {
           "version": "2.7.5",
           "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
diff --git a/package-lock.json b/package-lock.json
index 44daf5a8..080fd761 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -137,7 +137,8 @@
       "integrity": "sha1-HAPA8PaBvJRYcoaMPbLthLvCFXE="
     },
     "angular-intro.js": {
-      "version": "github:appirio-tech/angular-intro.js#81610d6c3f03437d5cc38211482d43385e2d7be9"
+      "version": "github:appirio-tech/angular-intro.js#81610d6c3f03437d5cc38211482d43385e2d7be9",
+      "from": "github:appirio-tech/angular-intro.js#81610d6c3f03437d5cc38211482d43385e2d7be9"
     },
     "angular-jwt": {
       "version": "0.0.9",
@@ -271,6 +272,11 @@
             "lodash": "3.10.1"
           },
           "dependencies": {
+            "bluebird": {
+              "version": "3.5.0",
+              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+              "integrity": "sha512-3LE8m8bqjGdoxfvf71yhFNrUcwy3NLy00SAo+b6MfJ8l+Bc2DzQ7mUHwX6pjK2AxfgV+YfsjCeVW3T5HLQTBsQ=="
+            },
             "lodash": {
               "version": "3.10.1",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
@@ -378,6 +384,7 @@
     },
     "appirio-tech-react-components": {
       "version": "github:appirio-tech/react-components#25a102b55c1769fe2b42a222d37359f09dc24763",
+      "from": "github:appirio-tech/react-components#25a102b55c1769fe2b42a222d37359f09dc24763",
       "requires": {
         "appirio-styles": "0.0.26",
         "appirio-tech-api-schemas": "5.0.70",
@@ -656,7 +663,8 @@
       },
       "dependencies": {
         "qs": {
-          "version": "git+https://github.com/jfromaniello/node-querystring.git#5d96513991635e3e22d7aa54a8584d6ce97cace8"
+          "version": "git+https://github.com/jfromaniello/node-querystring.git#5d96513991635e3e22d7aa54a8584d6ce97cace8",
+          "from": "git+https://github.com/jfromaniello/node-querystring.git#5d96513991635e3e22d7aa54a8584d6ce97cace8"
         }
       }
     },
@@ -1696,9 +1704,9 @@
       }
     },
     "bluebird": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-      "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.2.tgz",
+      "integrity": "sha512-NNHWKNa8vvPmSmHigyrPxq4JFUrkXoGBEAJqZTgZoV62Nr551f89oH2+P8s8NIpgjl6SkV0drNeXiKAeVXyjVA=="
     },
     "blueimp-tmpl": {
       "version": "2.5.7",
@@ -3126,6 +3134,12 @@
           "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
           "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
           "dev": true
+        },
+        "tapable": {
+          "version": "0.1.10",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+          "integrity": "sha512-jX8Et4hHg57mug1/079yitEKWGB3LCwoxByLsNim89LABq8NqgiX+6iYVOsq0vX8uJHkU+DZ5fnq95f800bEsQ==",
+          "dev": true
         }
       }
     },
@@ -3293,6 +3307,12 @@
           "integrity": "sha1-W28VR/TRAuZw4UDFCb5ncdautUk=",
           "dev": true
         },
+        "estraverse": {
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
+          "integrity": "sha512-FpCjJDfmo3vsc/1zKSeqR5k42tcIhxFIlvq+h9j0fO2q/h2uLKyweq7rYJ+0CoVvrGQOxIS5wyBrW/+vF58BUQ==",
+          "dev": true
+        },
         "esutils": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz",
@@ -3462,10 +3482,9 @@
       }
     },
     "estraverse": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
-      "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=",
-      "dev": true
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.0.tgz",
+      "integrity": "sha512-oczetKWPj5mF6hd8/g9tvdUtGHsJdTVwRYRpLVy68CCoJGVE2uWKfmjHEVzx7SEuDGFaUlYbaecePMlC7pVaIQ=="
     },
     "estraverse-fb": {
       "version": "1.3.2",
@@ -4392,6 +4411,11 @@
         "toposort": "1.0.3"
       },
       "dependencies": {
+        "bluebird": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+          "integrity": "sha512-3LE8m8bqjGdoxfvf71yhFNrUcwy3NLy00SAo+b6MfJ8l+Bc2DzQ7mUHwX6pjK2AxfgV+YfsjCeVW3T5HLQTBsQ=="
+        },
         "camel-case": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
@@ -6316,11 +6340,11 @@
       "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
     },
     "moment-timezone": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz",
-      "integrity": "sha1-mc5cfYJyYusPH3AgRBd/YHRde5A=",
+      "version": "0.5.35",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.35.tgz",
+      "integrity": "sha512-cY/pBOEXepQvlgli06ttCTKcIf8cD1nmNwOKQQAdHBqYApQSpAqotBMX0RJZNgMp6i0PlZuf1mFtnlyEkwyvFw==",
       "requires": {
-        "moment": "2.18.1"
+        "moment": ">= 2.9.0"
       }
     },
     "ms": {
@@ -9641,10 +9665,9 @@
       "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
     },
     "tapable": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
-      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
-      "dev": true
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz",
+      "integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg=="
     },
     "tar": {
       "version": "2.2.1",
@@ -9659,6 +9682,7 @@
     },
     "tc-accounts": {
       "version": "git+https://github.com/appirio-tech/accounts-app.git#fb214bc1d9fe889ae27d47e51526db226822991c",
+      "from": "git+https://github.com/appirio-tech/accounts-app.git#fb214bc1d9fe889ae27d47e51526db226822991c",
       "requires": {
         "angucomplete-alt": "2.5.0",
         "angular": "1.6.5",
@@ -9871,6 +9895,7 @@
     },
     "topcoder-app-r": {
       "version": "git+https://github.com/appirio-tech/topcoder-app-r.git#d74851b03d031bb4a427626033eee2436e5915f8",
+      "from": "git+https://github.com/appirio-tech/topcoder-app-r.git#d74851b03d031bb4a427626033eee2436e5915f8",
       "requires": {
         "appirio-styles": "0.0.30",
         "classnames": "2.2.5",
@@ -10411,6 +10436,12 @@
             "has-flag": "1.0.0"
           }
         },
+        "tapable": {
+          "version": "0.1.10",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+          "integrity": "sha512-jX8Et4hHg57mug1/079yitEKWGB3LCwoxByLsNim89LABq8NqgiX+6iYVOsq0vX8uJHkU+DZ5fnq95f800bEsQ==",
+          "dev": true
+        },
         "uglify-js": {
           "version": "2.7.5",
           "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
diff --git a/package.json b/package.json
index 7ff167e7..a012901a 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "jstimezonedetect": "1.0.6",
     "lodash": "4.17.4",
     "moment": "2.18.1",
-    "moment-timezone": "0.5.13",
+    "moment-timezone": "0.5.35",
     "ng-dialog": "0.5.9",
     "react-select": "1.0.0-beta8",
     "restangular": "1.6.1",