various cwas updates
cwas mdmr test updates
Merge branch 'cwas' into 0.3.3_development