add some axis flipping to try to make fsl happy
Merge remote-tracking branch 'group/master'

Conflicts:
	lib/Core/DataStorage/image.hpp
a little cmake cleaning
clean up getScaling for complex
make clang a bit happier
increase blocksize on compression filter and don't touch the progress bar there if it is set already
Merge branch 'master' into fsl
add warning about MemChunkNonDel
prevent "Unknown" entries for the dicom dictionary
make ImageFormat_NiftiSa::guessSliceOrdering a bit more robust against weird images
have a bit more generic flipping in nifti_sa
improve fsl support in nifti_sa (should conform to "Chris Rorden's dcm2nii :: 12 12 2012" now)
Merge branch 'fsl'
when reading dicom remove AcquisitionNumber if its a duplicate of InstanceNumber
make the sanity check for the slice distance less picky and other cosmetics
use vector3 for diffusionGradient
fix bug when byteswapping floating point data
add test and benchmark for byteswap
Merge branch 'master' of github.com:DerOrfa/isis

Conflicts:
	lib/ImageIO/imageFormat_nifti_sa.cpp
astyle -r --suffix=none --formatted --options=design/astylerc *.{c,h}pp