Merge branch 'release/1.1.2'
Allow identity.version to pick out UAA to run with tomcat

Change-Id: I94437b2b4fd6428d1df017113f67921a972b4752
Merge branch 'hotfix/guide'

Change-Id: Ie53b54801928c320f11e6e6c720c7de15784cf3e
Add support to allow for deleting approvals for a client

Change-Id: I1ef62126b0fe4c47fe0ea9b4bc2b143205a35d2b
Merge pull request #3 from joeldsa/support_for_delete

Add support to allow for deleting approvals for a client
Style for delete button - approvals.jsp
Merge pull request #4 from jacksoncvm/develop

Style for delete button - approvals.jsp
Minor text updates
Merge pull request #5 from shalako/approvals

* approvals:
  Minor text updates
[cfid-616] Allow config override of prompts

[#44453639] [cfid-616] Switching authentication manager in the login server only works for webapp
[cfid-616] Add explicit authentication for vmc-style authorization calls

[Fixes #44453639] [cfid-616] Switching authentication manager in the login server only works for webapp
Fix broken integration test (text on auth page)
Explicitly log 500 errors.

Tomcat doesn't report these to the application
log, so adding them to the error-page controller
method will make them easier to track down.
Style updates for approvals
Fix path to favicon.ico
Fix delete icon
Merge pull request #6 from jacksoncvm/develop

Style updates for approvals
Add tooltips
Merge pull request #7 from jacksoncvm/develop

Add tooltips
Add contributor guidelines to README