made nonconjnix resampling not touch the data every iteration
Merge remote-tracking branch 'origin/master' into alex/dev

* origin/master:
  made nonconjnix resampling not touch the data every iteration