Merge branch 'BF_fslmrsi_basis_conj' into 'master'

BF: Conjugation of basis in fsl_mrsi now happens before adding any MM. Fixed report MRM reference.

Closes #17 and #18

See merge request fsl/fsl_mrs!26