Even more tweaks to disclaimer text
Adjust padding for disclaimer text
Merge branch 'master' into saml2