Merge branch 'master' of https://github.com/isis-group/isis
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'isisgroup/master'
Merge remote-tracking branch 'isisgroup/master'
Merge branch 'master' of https://github.com/lydiatgit/isis
Merge branch 'master' of https://github.com/isis-group/isis
SiemensTcpIp bugfix indexOrigin voxelGap
SiemensTcpIP next version of bugfix for orientation information and indexOrigin
Merge branch 'master' of https://github.com/isis-group/isis
Bugfix SiemensTcpIP Plugin:

Orientation/IndexOrigin calculation now works for coronal/sagittal mosaics
workaround for  mixed read/phase vec from functor
bugfix orientation information part I - so far for axial slices
finish orientation information assignment for coronal and sagittal orientation
sform/qform problem - now write both the same if not existing before, spm routines are looking for sform, so it's errorneous is no sform can be found
Merge branch 'master' of https://github.com/isis-group/isis

Conflicts:
	lib/ImageIO/imageFormat_nifti_sa.cpp