Small fixes 02
Merge branch 'master' of https://github.com/hitec-luxembourg/DISP-MELM

Conflicts:
	src/test/java/lu/hitec/pssu/melm/services/MELMServiceImplTest.java