added ISIS Metadata
fixed Logout problem due to line break in OrganizationName
added diamond metadata
added ph: to SLO
changed formatting. Most elements are now on one line
re-fromatted slo-controller.jsp
re-built idp.war
Merge pull request #1 from flowedback/master

Pull latest from flowedback:master