fixed some paths and package names
Merge branch 'master' of
https://github.com/projectdanube/xdi2-example-server.git

Conflicts:
	src/main/resources/xdi2/example/server/applicationContext.xml