Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

Step/wwwroot/src/app_modules/machine/components/user-info.vue

@@ -1,8 +1,10 @@
 <template>
 <div class="user-info">
+  <!--
   <button class="dark-blue" @click="sendMessage('show-help')" :title="'header_tooltip_btn_help' | localize('Show Machine Help')">
       <i class="fa fa-question"></i>
   </button>
+  -->
   <button class="dark-blue"
     @click="sendMessage('show-machine-info')" :title="'header_tooltip_btn_mchinfo' | localize('Show Machine Info')">
     <img src="assets/icons/png/machine-info.png" width="28px">

Step/wwwroot/src/app_modules/production/components/card-job-production.vue

@@ -6,7 +6,7 @@
                 <label v-if="currentProgram">{{currentProgramName}}</label>
             </div>
             <div class="box-right">
-                <button class="btn" v-if="noQueue" @click="deactivateProgram()" :disabled="!canLoadProgram"><i class="fa fa-trash" aria-hidden="true"></i></button>
+                <button class="btn" v-if="noQueue" @click="deactivateProgram()" :disabled="!canLoadProgram"><i class="fa fa-times" aria-hidden="true"></i></button>
                 <button class="btn" v-if="!noQueue" @click="stopQueue()" :disabled="!startStopQueueEnabled"><i class="fa fa-stop" aria-hidden="true"></i></button>
 
                 <div class="rectangle" v-if="false">