Keystore added to Tomcat on IdP instance
Merge branch 'master' of https://github.com/thxmasj/federation-demo

Conflicts:
	packer/idp.json
More work on RP, reorganize files a little