Updates to phenotype highlighting
Bug fixes for Master #409, Phenogrid #6,7