display
Merge branch 'master' of https://github.com/neuropoly/spinalcordtoolbox

Conflicts:
	scripts/sct_dmri_separate_b0_and_dwi.py
	-->  resolved using yours