Merge branch 'master' into test_opt
Merge branch 'test_opt' of https://github.com/neuropoly/spinalcordtoolbox into test_opt
TEST: missing tests added
BUG: fixed bug
Merge branch 'test_opt' into jca_regMultimodalUsingsliceReg

Conflicts:
	testing/test_all.py