saml key refactor
Merge remote-tracking branch 'upstream/master'
cleanup
publish protocol support
app importer
conflict
Merge pull request #803 from patriot1burke/master

saml entity descriptor importer
saml docs
idp descriptor
Merge pull request #804 from patriot1burke/master

idp descriptor
KEYCLOAK-728
KEYCLOAK-777 No login event for social login
KEYCLOAK-351 Third level of navigation disappears in 'Add Role' pages
KEYCLOAK-352 Third level of navigation is not necessary in some pages
Merge pull request #805 from stianst/master

Fixes
KEYCLOAK-772 Event settings are not imported
Merge pull request #806 from stianst/master

KEYCLOAK-772 Event settings are not imported
add tomcat7 adapter test
Merge pull request #807 from patriot1burke/master

add tomcat7 adapter test
KEYCLOAK-726 Downloading a OAuth client installation file results on wrong JSON