Refactoring: ModelMapper is now a Spring managed Bean; DuplicateStateException was replaced with IllegalStateException
Merge remote-tracking branch 'origin/devel' into devel