Merge branch 'master' of github.com:bcdev/smos-box

Conflicts:
	smos-reader/src/main/java/org/esa/beam/dataio/smos/DggFile.java