Adding initial work for new AMSampleEditor.
Merge branch 'Issue496' of github.com-acquaman:acquaman/acquaman into Issue496
Fixed minor merge confict in AMSamplePlate