diff --git a/bower.json b/bower.json
index 19ebea4a..6d52ca0c 100644
--- a/bower.json
+++ b/bower.json
@@ -24,7 +24,8 @@
     "angular-bootstrap": "~0.10.0",
     "angular-dialog-service": "~3.1.0",
     "ng-file-upload": "~1.2.10",
-    "angular-growl-v2": "JanStevens/angular-growl-2#~0.5.3"
+    "angular-growl-v2": "JanStevens/angular-growl-2#~0.5.3",
+    "bluebird": "~1.1.1"
   },
   "private": true,
   "resolutions": {
diff --git a/webpack.config.js b/webpack.config.js
index 9f4709c2..d5392e6c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -24,6 +24,7 @@ module.exports = {
     , 'socket.io': 'socket.io-client/dist/socket.io'
     , 'oboe': 'oboe/dist/oboe-browser'
     , 'ng-file-upload': 'ng-file-upload/angular-file-upload'
+    , 'bluebird': 'bluebird/js/browser/bluebird'
     }
   }
 , module: {
@@ -50,10 +51,11 @@ module.exports = {
     , { test: /angular-animate\.js/, loader: 'imports?angular=angular'}
     , { test: /angular-growl\.js/, loader: 'imports?angular=angular'}
     , { test: /oboe-browser\.js/, loader: 'imports?define=>false!exports?oboe'}
-    , { test: /uuid\.js/, loader: 'imports?require=>false'}
+    , { test: /uuid\.js/, loader: 'imports?require=>undefined'}
     , { test: /localforage\.js/, loader: 'script'}
     , { test: /ui-bootstrap-tpls\.js/, loader: 'script'}
     , { test: /dialogs\.js/, loader: 'script'}
+    , { test: /bluebird\.js/, loader: 'imports?require=>undefined'}
     ]
   , noParse: [
       // pathutil.resource('bower_components')