Anden version
Merge branch 'master' of
https://github.com/Septima/spatialsuite-widget.git

Conflicts:
	config/widgetconfig.xml
	datasources/datasources.xml
	test/testData.txt