remove control M
Merge /www/htdocs/cbirkett/t3/wheatplus
Merge /www/htdocs/cbirkett/t3/wheatplus
add option to specify checks/block in madii design
Merge /www/htdocs/cbirkett/t3/wheatplus
Merge /www/htdocs/cbirkett/t3/wheatplus
fix url in trial code
add new features to madii, convert code to PSR2 standard, add comments to alpha design
Merge /www/htdocs/cbirkett/t3/wheatplus
Merge /www/htdocs/cbirkett/t3/wheatplus
add support for new mysql table and large genotype data
Merge /www/htdocs/cbirkett/t3/wheatplus
add support for new mysql table and large genotype data
Merge /www/htdocs/cbirkett/t3/wheatplus

Conflicts:
	display_genotype.php
clean up code
Merge /www/htdocs/cbirkett/t3/wheatplus

Conflicts:
	theme/new.js
bug in quickLinks
Merge /www/htdocs/cbirkett/t3/wheatplus
modify genotype query to use allele frequency table as data present
Merge /www/htdocs/cbirkett/t3/wheatplus