restored non-null attribute where it belongs
fixed migration order
interim fix for genotype_value
Merge branch 'issue-2' into merged