Default year is 2004
AATSR year is 2004
AATSR year is 2004
Merge remote-tracking branch 'origin/master'

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