Working on #1487 full matrix sampling
merged with develop
Merge branch 'develop' of ssh://git@github.com/Caleydo/caleydo.git into develop