further work on implementation of colims importer
attempt tot catch "_" earlier ---> peptideshaker can't handle these
Merge branch 'develop' into fixing_database_IOissue

Conflicts:
	compomics-relims/pom.xml
ignore testcase 8437