Bughunting for the new features
Bughunting for the new features
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dioptas_main/Views/ExLegendItem.py
	Dioptas_main/Views/IntegrationView.py