Update web-app xml
Merge remote-tracking branch 'origin/amsterdamDemo' into unifi

Conflicts:
	fuseco/src/main/webapp/WEB-INF/web.xml