From 4522c1d78c72c7fef0ef85b990842c5c2bb7a827 Mon Sep 17 00:00:00 2001
From: David Baldwynn <david.baldwin@alumni.ubc.ca>
Date: Tue, 3 Nov 2015 11:04:59 -0800
Subject: [PATCH] fixed bower dependencies

---
 bower.json   |  2 +-
 package.json | 40 ++++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/bower.json b/bower.json
index cf441087..458ee67f 100755
--- a/bower.json
+++ b/bower.json
@@ -31,7 +31,7 @@
     "angular-input-stars": "*",
     "file-saver.js": "~1.20150507.2",
     "angular-bootstrap-colorpicker": "~3.0.19",
-    "font-awesome": "~4.4.0"
+    "components-font-awesome": "~4.4.0"
   },
   "resolutions": {
     "angular": "~1.3.17"
diff --git a/package.json b/package.json
index 34820a38..6671711a 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,22 @@
     "forever": "~0.15.1",
     "fs-extra": "~0.26.0",
     "glob": "~4.0.5",
+    "grunt": "~0.4.1",
+    "grunt-cli": "~0.1.13",
+    "grunt-concurrent": "~2.0.4",
+    "grunt-contrib-csslint": "~0.5.0",
+    "grunt-contrib-cssmin": "~0.14.0",
+    "grunt-contrib-jshint": "~0.11.3",
+    "grunt-contrib-uglify": "~0.10.0",
+    "grunt-contrib-watch": "~0.6.1",
+    "grunt-env": "~0.4.1",
+    "grunt-html2js": "^0.3.5",
+    "grunt-karma": "~0.12.1",
+    "grunt-mocha-test": "~0.12.1",
+    "grunt-newer": "~1.1.1",
+    "grunt-ng-annotate": "~1.0.1",
+    "grunt-node-inspector": "~0.4.1",
+    "grunt-nodemon": "~0.4.0",
     "helmet": "~0.13.0",
     "load-grunt-tasks": "~3.3.0",
     "lodash": "^3.10.1",
@@ -48,7 +64,6 @@
     "mongoose-utilities": "^0.1.1",
     "morgan": "~1.6.1",
     "multer": "~1.1.0",
-    "pdffiller": "~0.1.1",
     "nodemailer": "~1.8.0",
     "passport": "~0.3.0",
     "passport-facebook": "~2.0.0",
@@ -57,33 +72,19 @@
     "passport-linkedin": "~1.0.0",
     "passport-local": "~1.0.0",
     "passport-twitter": "~1.0.2",
+    "pdffiller": "~0.1.1",
+    "rand-token": "^0.2.1",
     "raven": "^0.8.1",
     "request": "^2.60.0",
     "request-promise": "^1.0.2",
     "satelize": "~0.1.1",
     "soap": "^0.11.0",
     "swig": "~1.4.1",
-    "then-fs": "~2.0.0",
-    "grunt": "~0.4.1",
-    "grunt-cli": "~0.1.13",
-    "grunt-concurrent": "~2.0.4",
-    "grunt-contrib-csslint": "~0.5.0",
-    "grunt-contrib-cssmin": "~0.14.0",
-    "grunt-contrib-jshint": "~0.11.3",
-    "grunt-contrib-uglify": "~0.10.0",
-    "grunt-contrib-watch": "~0.6.1",
-    "grunt-env": "~0.4.1",
-    "grunt-karma": "~0.12.1",
-    "grunt-newer": "~1.1.1",
-    "grunt-ng-annotate": "~1.0.1",
-    "grunt-node-inspector": "~0.4.1",
-    "grunt-nodemon": "~0.4.0",
-    "grunt-mocha-test": "~0.12.1",
-    "grunt-html2js": "^0.3.5"
+    "then-fs": "~2.0.0"
   },
   "devDependencies": {
     "node-mandrill": "^1.0.1",
-    "karma-chrome-launcher": "^0.1.12",
+    "karma-chrome-launcher": "~0.2.1",
     "karma-jasmine-html-reporter": "^0.1.8",
     "karma-mocha-reporter": "^1.1.1",
     "karma-ng-html2js-preprocessor": "^0.2.0",
@@ -92,7 +93,6 @@
     "supertest-session": "^1.0.0",
     "mailosaur": "^1.0.1",
     "karma": "~0.13.14",
-    "karma-chrome-launcher": "~0.2.1",
     "karma-coverage": "~0.5.3",
     "karma-firefox-launcher": "~0.1.3",
     "karma-jasmine": "^0.3.6",