Workaround for clerezza serializer
Merge branch 'master' of
https://github.com/fusepool/silklinkingengine.git

Conflicts:
	src/main/resources/silk-config3.xml