Merge branch 'develop' into pre-master
Merge branch 'develop' into pre-master
Merge branch 'develop' into pre-master
Merge branch 'develop' into pre-master
Adding setup.cfg to smhi branch
Adding manifest file
Adding config file for smhi
Added pyspectral.cfg.template file path to manifest file
Merge branch 'smhi' of /data/proj/SAF/GIT/pyspectral into develop

Conflicts:
	MANIFEST.in