premerge commit -smd
merged chris and shane, fixed display inactive chkBox