Merge branch 'master' of github.com:bcdev/sst-cci-toolbox

Conflicts:
	mms/src/main/java/org/esa/cci/sst/tools/SamplingTool.java
	mms/src/test/java/org/esa/cci/sst/tools/SamplingToolTest.java