Merge branch 'bug-16236-hotspot-search-imagestatisticscalculator' into bug-16236-hotspot-search-imagestatisticscalculator-integration-snapshot
Conflicts:
Modules/ImageStatistics/Testing/mitkImageStatisticsHotspotTest.cpp
Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp
Modules/ImageStatistics/mitkImageStatisticsCalculator.h