add check for missing trial name
Merge /www/htdocs/cbirkett/t3/wheatplus
modify display_genotype.php page so that the "Download Allele Data" function will convert GBS data back to original ACTG format
Merge /www/htdocs/cbirkett/t3/wheatplus

Conflicts:
	display_genotype.php
added check for missing data in fieldbook import
Merge /www/htdocs/cbirkett/t3/wheatplus
added check for missing data in fieldbook import
Merge /www/htdocs/cbirkett/t3/wheatplus
improve error messages in CSR Phenotype Results import
Merge /www/htdocs/cbirkett/t3/wheatplus
in 2D genotype import do not allow import if marker sequence and allele information not present
Merge /www/htdocs/cbirkett/t3/wheatplus
modify fieldbook page to display data loaded in database
modify fieldbook page to display data loaded in database
modify fieldbook page to display data loaded in database
modify fieldbook page to display data loaded in database
modify fieldbook page to display data loaded in database
modify fieldbook page to display data loaded in database
modify fieldbook page to display data loaded in database
Merge /www/htdocs/cbirkett/t3/wheatplus