From 9fc8178f469531e7a31c2471986f15eb9a6a2775 Mon Sep 17 00:00:00 2001
From: Alejandro De Maria Antolinos <demariaa@esrf.fr>
Date: Mon, 26 Nov 2018 16:17:02 +0100
Subject: [PATCH 1/2] Menu Protein and crystals appear

---
 js/mx/menu/mxmainmenu.js    | 9 ++-------
 js/mx/menu/mxmanagermenu.js | 4 ++--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/js/mx/menu/mxmainmenu.js b/js/mx/menu/mxmainmenu.js
index 4ea23e1a9..860002a76 100644
--- a/js/mx/menu/mxmainmenu.js
+++ b/js/mx/menu/mxmainmenu.js
@@ -19,12 +19,7 @@ MXMainMenu.prototype.getMenuItems = function() {
 	return [
 		this.getHomeItem(),
 		this.getShipmentItem(),
-		/*{
-                text : this._convertToHTMLWhiteSpan("Proteins and Crystals <sub style='font-size:10px;color:orange'>NEW</sub>"),
-                cls : 'ExiSAXSMenuToolBar',
-                disabled : false,
-                menu : this.getProteinCrystalsMenu() 
-	    	},
+	
 			{
                 text : this._convertToHTMLWhiteSpan("Proteins and Crystals <sub style='font-size:10px;color:orange'>NEW</sub>"),
                 cls : 'ExiSAXSMenuToolBar',
@@ -32,7 +27,7 @@ MXMainMenu.prototype.getMenuItems = function() {
                 handler : function(){
                     location.hash = "#/protein/list";
                 }
-	    	},*/
+	    	},
 	    	{
                 text : this._convertToHTMLWhiteSpan("Prepare Experiment"),
                 cls : 'ExiSAXSMenuToolBar',
diff --git a/js/mx/menu/mxmanagermenu.js b/js/mx/menu/mxmanagermenu.js
index f0a4d66eb..dddf9462e 100644
--- a/js/mx/menu/mxmanagermenu.js
+++ b/js/mx/menu/mxmanagermenu.js
@@ -32,14 +32,14 @@ MXManagerMenu.prototype.getMenuItems = function() {
                 
 				}
 		},
-		/*{
+		{
                 text : this._convertToHTMLWhiteSpan("Proteins and Crystals <sub style='font-size:10px;color:orange'>NEW</sub>"),
                 cls : 'ExiSAXSMenuToolBar',
                 disabled : false,
                 handler : function(){
                     location.hash = "#/protein/list";
                 }
-	    	},*/
+	    },
 		{
 				text : this._convertToHTMLWhiteSpan("Data Explorer"),
 				cls : 'ExiSAXSMenuToolBar',

From afcc3afa4b4180a8aab259041b50be0b595d21b6 Mon Sep 17 00:00:00 2001
From: Alejandro De Maria Antolinos <demariaa@esrf.fr>
Date: Mon, 26 Nov 2018 16:33:30 +0100
Subject: [PATCH 2/2] It fixes https://github.com/ispyb/EXI/issues/463

---
 js/core/view/shipping/csvpuckformview.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/js/core/view/shipping/csvpuckformview.js b/js/core/view/shipping/csvpuckformview.js
index 4f22ee93c..f32972969 100644
--- a/js/core/view/shipping/csvpuckformview.js
+++ b/js/core/view/shipping/csvpuckformview.js
@@ -246,9 +246,11 @@ CSVPuckFormView.prototype.csvToArray = function(csvContent) {
         if (allTextLines){
             if (allTextLines.length > 0){
                 var lines = [];
-                for (var i=0; i<allTextLines.length -1; i++) {
-                    var line = allTextLines[i].split(',');                                        
-                    lines.push(line);
+                for (var i=0; i<allTextLines.length -1; i++) {					
+					if (!allTextLines[i].trim().startsWith("#")){
+                    	var line = allTextLines[i].split(',');                                        
+                    	lines.push(line);
+					}
                 }
                 return lines;        
             }