From 5a780aa34c17725363868748837ae5e9fccb239b Mon Sep 17 00:00:00 2001
From: Amos Haviv <mail@amoshaviv.com>
Date: Mon, 23 Dec 2013 19:52:54 +0200
Subject: [PATCH] Adding Bower Resolutions

---
 bower.json                | 29 ++++++++++++++++-------------
 config/env/development.js |  6 +++---
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/bower.json b/bower.json
index 33f816f090..27e3bc159f 100644
--- a/bower.json
+++ b/bower.json
@@ -1,14 +1,17 @@
 {
-  "name": "mean",
-  "version": "0.1.0",
-  "dependencies": {
-    "angular": "latest",
-    "angular-resource": "latest",
-    "angular-cookies": "latest",
-    "angular-mocks": "latest",
-    "angular-route": "latest",
-    "bootstrap": "2.3.2",
-    "angular-bootstrap": "0.7.0",
-    "angular-ui-utils": "0.0.4"
-  }
-}
+    "name": "mean",
+    "version": "0.1.0",
+    "dependencies": {
+        "angular": "latest",
+        "angular-resource": "latest",
+        "angular-cookies": "latest",
+        "angular-mocks": "latest",
+        "angular-route": "latest",
+        "bootstrap": "2.3.2",
+        "angular-bootstrap": "0.7.0",
+        "angular-ui-utils": "0.0.4"
+    },
+    "resolutions": {
+        "angular": "1.2.6"
+    }
+}
\ No newline at end of file
diff --git a/config/env/development.js b/config/env/development.js
index 4d723d6cc3..656ffbaabf 100644
--- a/config/env/development.js
+++ b/config/env/development.js
@@ -1,11 +1,11 @@
 module.exports = {
-    db: "mongodb://admin:password@ds027308.mongolab.com:27308/meanstack",
+    db: "mongodb://localhost/mean-dev",
     app: {
         name: "MEAN - A Modern Stack - Development"
     },
     facebook: {
-        clientID: "455818271176818",
-        clientSecret: "db6c579d1fcdc9a3980bc4aade0e3aaf",
+        clientID: "APP_ID",
+        clientSecret: "APP_SECRET",
         callbackURL: "http://localhost:3000/auth/facebook/callback"
     },
     twitter: {