Updated Key Discovery and more tests
Merge branch 'master' of github.com:Netflix/NfWebCrypto

Conflicts:
	.cproject