index on master: 01ff9b4 Merge branch 'bug-18054-FiberfoxMiniApp'
WIP on master: 01ff9b4 Merge branch 'bug-18054-FiberfoxMiniApp'
Merge branch 'test' into bug-18057-SignalSampling

Conflicts:
	Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberfoxParameters.h
saving sampled signals in parameter file
Merge branch 'bug-18057-SignalSampling'