Merge pull request #426 from bleathem/master

bower resolution fix of jquery

Author: bleathem

bower.json

@@ -48,5 +48,8 @@
   "devDependencies": {
     "angular-mocks": "1.3.0 - 1.5.*",
     "angular-ui-router": "1.0.0-beta.3"
+  },
+  "resolutions": {
+    "jquery": "~2.1.4"
   }
 }