Merge pull request #1123 from pencilblue/issue1074

matched bower versions to CDN versions

bower.json

@@ -10,11 +10,11 @@
   ],
   "private": true,
   "dependencies": {
-    "angular-route": "~1.3.2",
-    "angular-sanitize": "~1.3.2",
-    "angular": "~1.3.2",
+    "angular-route": "~1.2.15",
+    "angular-sanitize": "~1.2.15",
+    "angular": "~1.2.15",
     "jquery": "~1.11.1",
-    "bootstrap": "~3.1.1",
+    "bootstrap": "~3.2.0",
     "fontawesome": "~4.2.0",
     "datetimepicker": "~2.2.8",
     "html5shiv": "~3.7.2",
@@ -23,12 +23,15 @@
     "jqueryui-touch-punch": "*",
     "jquery-file-upload": "~9.7.0",
     "jquery.iframe-transport": "~1.0.0",
-    "jquery.validation": "~1.13.0",
+    "jquery.validation": "~1.12.0",
     "jquery.spinjs": "*",
     "to-markdown": "~0.0.2",
     "markdown": "~0.5.0",
-    "danialfarid-angular-file-upload": "~1.6.12",
+    "danialfarid-angular-file-upload": "~1.6.1",
     "ng-sortable": "~1.1.6",
     "rangy-release": "~1.3.0"
+  },
+  "resolutions": {
+    "angular": "~1.2.15"
   }
 }