Added exomple file for deploy.credential
Renamed TomCat webapp irma_web_relay to test_...
Deploy through Apache proxy using SSL.
Merge remote-tracking branch 'origin/master' into test

Conflicts:
	deploy.properties