updates to match XDI2 refactoring
Merge branch 'master' of https://github.com/projectdanube/xdi2-redis.git

Conflicts:
	src/main/webapp/WEB-INF/applicationContext.xml