Merge branch 'lipid' of mmka.chem.univ.gda.pl:unres into lipid