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

Conflicts:
	mms/src/main/java/org/esa/cci/sst/tools/MatchupGenerator.java
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 17 commits.
#   (use "git push" to publish your local commits)
#
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   mms/src/main/java/org/esa/cci/sst/tools/MatchupGenerator.java
#	modified:   mms/src/main/java/org/esa/cci/sst/tools/samplepoint/SamplePointExporter.java
#	new file:   mms/src/main/java/org/esa/cci/sst/tools/samplepoint/SamplePointImporter.java
#	new file:   mms/src/main/java/org/esa/cci/sst/tools/samplepoint/SamplingPointUtil.java
#	new file:   mms/src/main/java/org/esa/cci/sst/util/ConfigUtil.java
#	modified:   mms/src/test/java/org/esa/cci/sst/tools/samplepoint/SamplePointExporterIntegrationTest.java
#	modified:   mms/src/test/java/org/esa/cci/sst/tools/samplepoint/SamplePointExporterTest.java
#	new file:   mms/src/test/java/org/esa/cci/sst/tools/samplepoint/SamplePointImporterIntegrationTest.java
#	new file:   mms/src/test/java/org/esa/cci/sst/tools/samplepoint/SamplingPointUtilTest.java
#	new file:   mms/src/test/java/org/esa/cci/sst/util/ConfigUtilTest.java
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   mms/src/main/java/org/esa/cci/sst/tools/MatchupGenerator.java
#