deleted
Merge branch 'master' of https://jenspeters@github.com/da-nrw/DNSCore

Conflicts:
	DAWeb/.classpath
	DAWeb/.project