more fixes
Merge branch 'memOpt_idXML' of https://github.com/cbielow/OpenMS into memOpt_idXML