starting to move stuff
Merge remote branch 'origin/slice_motion_correction' into slice_motion_correction

* origin/slice_motion_correction:
  starting to move stuff