Fix: change irma_web_relay back to irma_web_service
Merge remote-tracking branch 'origin' into test

Conflicts:
	deploy.properties