Cleared the code
Merge branch 'ThomasBrunelBranch'

Conflicts:
	ProjetCytoscape/src/main/java/de/bioquant/cytoscape/pidfileconverter/FileReader/AffymetrixRegexReader.java