Merge 970f54f into 0dcbc36

bower.json

@@ -1,6 +1,6 @@
 {
-  "name": "Mirador",
-  "version": "2.0.0",
+  "name": "mirador",
+  "version": "2.1.1",
   "homepage": "https://github.com/IIIF/m2",
   "authors": [
     "aeschylus <scipioaffricanus@gmail.com>"
@@ -20,17 +20,21 @@
     "tests"
   ],
   "dependencies": {
+    "jquery": "https://code.jquery.com/jquery-3.1.1.min.js",
     "jquery-ui": "*",
     "jquery.scrollTo": "~1.4.12",
     "mousetrap": "~1.4.6",
     "URIjs": "https://github.com/medialize/URI.js.git#~1.13.2",
     "paper": "git://github.com/paperjs/paper.js.git#*",
     "spectrum": "git://github.com/bgrins/spectrum.git#*",
     "jquery-awesome-cursor": "git://github.com/jwarby/jquery-awesome-cursor.git#*",
-    "qTip2": "~2.2.1"
+    "qtip2": "~2.2.1"
   },
   "devDependencies": {
     "sinon-server": "http://sinonjs.org/releases/sinon-server-1.12.2.js",
     "jasmine-jquery": "~2.0.6"
+  },
+  "resolutions": {
+    "jquery": ">=1.7.2"
   }
 }

bower_components/Isfahan/.bower.json

@@ -1,34 +1,11 @@
 {
   "name": "Isfahan",
   "homepage": "https://github.com/aeschylus/Isfahan",
-  "authors": [
-    "aeschylus <scipioaffricanus@gmail.com>"
-  ],
-  "description": "A simple tiling window manager built with d3.js",
-  "keywords": [
-    "window",
-    "manager",
-    "layout",
-    "d3.js"
-  ],
-  "license": "MIT",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "app/bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {
-    "d3": "~3.4.12",
-    "jquery": "~2.1.1"
-  },
-  "_release": "4803a7a24e",
+  "_release": "b837f960cf",
   "_resolution": {
     "type": "branch",
     "branch": "master",
-    "commit": "4803a7a24ef32aad1597ef20dea0218577474039"
+    "commit": "b837f960cf1fbbb9117d0eb2a4cab88e82a6e6c5"
   },
   "_source": "https://github.com/aeschylus/Isfahan.git",
   "_target": "*",