merge-pheno-and-data.R function created and bugs in delete column fixed.
Merge branch 'master' of https://github.com/chipster/chipster.git
merge-pheno-and-data fixed to make unique row names
Add tsv support to genome browser and a sort tool.
Merge branch 'master' into data_beta

Conflicts:
	src/main/java/fi/csc/microarray/client/tasks/TaskExecutor.java
	src/main/java/fi/csc/microarray/databeans/DataFolder.java
	src/main/resources/version.number