merge to latest

nodes/core/core/20-inject.html

@@ -263,7 +263,7 @@ If you want every 20 minutes from now - use the <i>"interval"</i> option.</p>
             $("#node-input-payload").typedInput({
                 default: 'str',
                 typeField: $("#node-input-payloadType"),
-                types:['flow','global','str','num','bool','json','bin','date']
+                types:['flow','global','str','num','bool','json','bin','date','env']
             });
 
             $("#inject-time-type-select").change(function() {

nodes/core/core/58-debug.html

@@ -154,7 +154,9 @@
                 name: this._("debug.sidebar.name"),
                 content: uiComponents.content,
                 toolbar: uiComponents.footer,
-                enableOnEdit: true
+                enableOnEdit: true,
+                pinned: true,
+                iconClass: "fa fa-wrench"
             });
             RED.actions.add("core:show-debug-tab",function() { RED.sidebar.show('debug'); });