lipid sample name no longe needed (Annette)
fix issues with lipid-results merging in import; support new headers for lipids spreadsheet