#dev integrated adapter tomcat7
#cfg update version
relative adapter urls
relative redirect uris
relative uri tests and fixes
Merge remote-tracking branch 'upstream/master'
Merge pull request #358 from patriot1burke/master

dynamic key lookup, relative uris
Merge pull request #352 from ungarida/master

Tomcat7 adapter
fix tomcat7 build
Merge pull request #359 from patriot1burke/master

fix tomcat7 build
adatper deployment context fixes, picketlink abstraction
Merge pull request #360 from patriot1burke/master

adatper deployment context fixes, picketlink abstraction
remove picketlink dependencies
Removing JSP code, adding simple text for a simple demo...
Fix breadcrumb for audit pages£
KEYCLOAK-441 Remove org.json
Merge pull request #363 from stianst/master

Removed org.json
port fix
merge fixes
Merge pull request #361 from patriot1burke/master

remove ups social dependencies