Merge branch 'master' into tabby-out

Conflicts:
	config.js

bower.json

@@ -19,5 +19,8 @@
     "es5-shim": "~3.3.0",
     "codemirror": "~3.24.0",
     "require-css": "~0.1.2"
+  },
+  "devDependencies": {
+    "jquery": ">=1.7.0 <2.1.0"
   }
 }

config.js

@@ -4,37 +4,46 @@ var require;
 if (!require) require = {config: function (x) {require = x;}};
 require.config({
   "paths": {
-    "amber": "support",
-    "amber_vm": "support/deprecated-vm-files",
-    "amber_vm/_st": "support/deprecated-vm-files/as-receiver",
-    "amber_css": "support/resources",
-    "amber_core": "src",
-    "amber_cli": "external/amber-cli/src",
-    "helios": "my/helios/src",
-    "helios/set": "my/helios/set",
-    "helios/resources": "my/helios/resources",
-    "helios/index": "my/helios/index",
-    "amber_lib/codemirror": "bower_components/codemirror",
-    "amber_lib/es5-shim": "bower_components/es5-shim",
-    "jquery-ui": [
-      "bower_components/jquery-ui/jquery-ui.min",
-      "bower_components/jquery-ui/ui/minified/jquery-ui.min",
-      "bower_components/jquery-ui/jquery-ui.min",
-      "bower_components/jquery-ui/ui/minified/jquery-ui.min"
-    ],
+    "amber_lib/showdown": "my/helios/bower_components/showdown",
     "jquery": [
       "bower_components/jquery/dist/jquery.min",
       "bower_components/jquery/jquery.min",
       "bower_components/jquery/dist/jquery.min",
       "bower_components/jquery/jquery.min"
     ],
-    "require-css": "bower_components/require-css",
+    "jquery-ui": [
+      "bower_components/jquery-ui/jquery-ui.min",
+      "bower_components/jquery-ui/ui/minified/jquery-ui.min",
+      "bower_components/jquery-ui/jquery-ui.min",
+      "bower_components/jquery-ui/ui/minified/jquery-ui.min"
+    ],
     "bootstrap2.3.2": "my/helios/bower_components/bootstrap2.3.2/bootstrap",
-    "amber_lib/showdown": "my/helios/bower_components/showdown"
+    "require-css": "bower_components/require-css",
+    "amber_lib/es5-shim": "bower_components/es5-shim",
+    "amber_lib/codemirror": "bower_components/codemirror",
+    "helios": "my/helios/src",
+    "helios/set": "my/helios/set",
+    "helios/resources": "my/helios/resources",
+    "helios/index": "my/helios/index",
+    "amber_cli": "external/amber-cli/src",
+    "amber": "support",
+    "amber_vm": "support/deprecated-vm-files",
+    "amber_vm/_st": "support/deprecated-vm-files/as-receiver",
+    "amber_css": "support/resources",
+    "amber_core": "src"
   },
   "shim": {
-    "ensure-console": {
-      "exports": "console"
+    "jquery-ui": {
+      "deps": [
+        "jquery",
+        "jquery"
+      ]
+    },
+    "bootstrap2.3.2/js/bootstrap": {
+      "deps": [
+        "jquery",
+        "css!bootstrap2.3.2/css/bootstrap"
+      ]
     },
     "amber_lib/codemirror/lib/codemirror": {
       "deps": [
@@ -51,17 +60,8 @@ require.config({
         "../../lib/codemirror"
       ]
     },
-    "jquery-ui": {
-      "deps": [
-        "jquery",
-        "jquery"
-      ]
-    },
-    "bootstrap2.3.2/js/bootstrap": {
-      "deps": [
-        "jquery",
-        "css!bootstrap2.3.2/css/bootstrap"
-      ]
+    "ensure-console": {
+      "exports": "console"
     }
   },
   "map": {