code documentation for csr index
add documentation for csr index calculation
Merge /www/htdocs/cbirkett/t3/wheatplus

Conflicts:
	curator_data/cal_index.php
	curator_data/cal_index_check.php
add trial legend and update documentation for genomic analysis
no change
Merge /www/htdocs/cbirkett/t3/wheatplus
change download and open with tassel page to use selected map instead of default
change open with tassel to use Tassel V4 jnlp
change download and open with tassel page to use selected map instead of default
    change open with tassel to use Tassel V4 jnlp
Merge /www/htdocs/cbirkett/t3/wheatplus
modify CSR index form with new formula and security checking
modify CSR index form with new formula and security checking
modify CSR index form with new formula and security checking
modify CSR index form with new formula and security checking
modify CSR index form with new formula and security checking
modify CSR index form with new formula and security checking
modify CSR index form with new formula and security checking
modify CSR index form with new formula and security checking
modify CSR index form with new formula and security checking
Merge /www/htdocs/cbirkett/t3/wheatplus

Conflicts:
	R/csr-index.R
	curator_data/csr.js
updated