Merge remote-tracking branch 'upstream/master'

Conflicts:
	registry.json

registry.json

@@ -115,6 +115,7 @@
   "bootstrap-wizard": "github:gwrey/bootstrap-wizard",
   "breeze": "npm:breeze-client",
   "buffer": "github:jspm/nodelibs-buffer",
+  "chai": "npm:chai",
   "chart": "github:nnnick/Chart.js",
   "child_process": "github:jspm/nodelibs-child_process",
   "chosen": "github:harvesthq/chosen",
@@ -131,6 +132,7 @@
   "curl": "github:cujojs/curl",
   "d3": "github:mbostock/d3",
   "datatables": "github:DataTables/DataTables",
+  "debug": "github:visionmedia/debug",
   "decimal.js": "github:MikeMcl/decimal.js",
   "dgram": "github:jspm/nodelibs-dgram",
   "di": "github:angular/di.js",
@@ -195,6 +197,7 @@
   "js-beautify": "github:beautify-web/js-beautify",
   "js.edgar": "npm:js.edgar",
   "jsfromhell": "github:jonasraoni/JSFromHell",
+  "jsol": "github:daepark/JSOL",
   "jsplumb": "github:sporritt/jsPlumb",
   "js-scrypt": "github:tonyg/js-scrypt",
   "kickstrap": "github:ajkochanowicz/Kickstrap",
@@ -215,6 +218,7 @@
   "meld": "github:cujojs/meld",
   "microplugin": "npm:microplugin",
   "minivents": "github:allouis/minivents",
+  "mithril": "npm:mithril",
   "mixing": "npm:mixing",
   "mocha": "npm:mocha",
   "modernizr": "github:Modernizr/Modernizr",
@@ -222,6 +226,7 @@
   "moment": "github:moment/moment",
   "moment-json-parser": "npm:moment-json-parser",
   "mongoose": "github:gavinaiken/mongoose-browser",
+  "moonridge-client": "github:capaj/Moonridge-client",
   "mq4-hover-shim": "npm:mq4-hover-shim",
   "msgs": "github:cujojs/msgs",
   "mustache": "github:janl/mustache.js",
@@ -313,6 +318,7 @@
   "url": "github:jspm/nodelibs-url",
   "util": "github:jspm/nodelibs-util",
   "vm": "github:jspm/nodelibs-vm",
+  "velocity": "github:julianshapiro/velocity",
   "vertxbus": "github:larrytin/bower-vertxbus",
   "virtual-dom": "npm:virtual-dom",
   "vue": "npm:vue",