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

Conflicts:
	shelly/toolpanel/static/toolpanel/src/js/index.js

Author: alexander-daniel