Human project added
merged branches
conflict resolved
Merge branch 'devel' into andrew_allele_det