Merge branch 'augustin' of github.com:neuropoly/spinalcordtoolbox into jca_regMultimodalUsingsliceReg

Conflicts:
	scripts/sct_straighten_spinalcord.py