Merge branch 'master' of github.com:plotly/streambed into toolmenu-style-methods

Conflicts:
	shelly/toolpanel/bin/watch-standalone.sh

Author: alexander-daniel

shelly/plotlyjs/static/plotlyjs/package.json

@@ -16,12 +16,19 @@
     "d3": "3.3.5",
     "delaunay-triangulate": "^1.1.6",
     "es6-promise": "^3.0.2",
+    "gl-error2d": "^1.0.0",
     "gl-error3d": "^1.0.0",
+    "gl-line2d": "^1.2.1",
     "gl-line3d": "^1.0.1",
     "gl-mat4": "^1.1.2",
     "gl-mesh3d": "^1.0.4",
+    "gl-plot2d": "^1.1.6",
     "gl-plot3d": "^1.3.0",
+    "gl-scatter2d": "^1.0.5",
+    "gl-scatter2d-fancy": "^1.1.1",
     "gl-scatter3d": "^1.0.4",
+    "gl-select-box": "^1.0.1",
+    "gl-spikes2d": "^1.0.1",
     "gl-surface3d": "^1.0.6",
     "mouse-change": "^1.1.1",
     "mouse-wheel": "^1.0.2",
@@ -30,6 +37,7 @@
     "ndarray-homography": "^1.0.0",
     "ndarray-ops": "^1.2.2",
     "right-now": "^1.0.0",
+    "robust-orientation": "^1.1.3",
     "superscript-text": "^1.0.0",
     "through2": "^2.0.0",
     "tinycolor2": "1.1.2",