Make sure we always use Java 1.6
Deploy through Apache proxy using SSL.
Fix: change irma_web_relay back to irma_web_service
Better logging and eligibility test
Updated readme
Merge branch 'master' into pilot

Conflicts:
	deploy.properties
Ignore context.xml
Merge branch 'master' into pilot