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.
Fix path to favicon.ico
Merge pull request #6 from jacksoncvm/develop

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

Add tooltips
Add contributor guidelines to README
Bump version to 1.2.0
[cfid-620] Add test dependency on SCIM jar
[cfid-498]: remove SCIM dependency from Login Server tests

[Fixes #42456177] [cfid-498] Re-separate SCIM infrastructure from the rest of the UAA
Fix the client delete on the approvals management page

Change-Id: I404dcb9384e3e896c64847a6251359477fed73be
[cfid-598] Made Yaml servlet initializer more generic (no UAA refs)

The servlet initializer had some hardcoded references UAA_* environment
variable names.  This change removes those and makes them configurable
via the servlet context.

[#44222845] [cfid-598] remove small uaa.yml from war file
Tooltip background fix for IE