bla
Merge remote-tracking branch 'origin/master'

Conflicts:
	Deconvolution/Deconvolution.cs
	HeatMapViewer/HeatMapViewerPlugin.cs