some progress with heatmap page
Merge branch 'master' of https://github.com/mpi2/PhenotypeArchive.git

Conflicts:
	src/main/java/uk/ac/ebi/phenotype/service/GenotypePhenotypeService.java