fix federation
anges to documentation
working with Federation
Merge branch 'master' of https://jenspeters@github.com/da-nrw/DNSCore

Conflicts:
	ContentBroker/src/main/java/de/uzk/hki/da/cb/FetchPIPsAction.java