Trackhub 'color' parameter should override our guess at track colour!
Trackhub 'color' parameter should override our guess at track colour!

Conflicts:

	modules/Bio/EnsEMBL/GlyphSet/bigbed.pm

Ensembl/ensembl-webcode,Ensembl/ensembl-webcode,Ensembl/ensembl-webcode,Ensembl/ensembl-webcode,Ensembl/ensembl-webcode