SAML principal attribute release must pass through the policy
moved around view config file. fixed resolver ordering
Merge branch 'master' into saml-attr-relp

Conflicts:
	cas-server-support-saml/src/main/java/org/jasig/cas/support/saml/web/view/Saml10SuccessResponseView.java
updated header license
ability to turn on/off slo per service, by having a new logout type for NONE
updated static imports
updated ctor with more deprecation details
updated ctor with more deprecation details
fixed cs line length issue
fixed indentation
Merge branch 'master' into slo-persvc-#573

Conflicts:
	cas-server-core/src/test/java/org/jasig/cas/logout/LogoutManagerImplTests.java
Merge branch 'master' into saml-attr-relp

Conflicts:
	cas-server-support-saml/src/main/java/org/jasig/cas/support/saml/web/view/AbstractSaml10ResponseView.java
moved saml views on classpath
Fixed misnamed props for truststore socketfactory.
Added template props for truststore settings
Issue#656: ability to include multiple config files for the DispatcherServlet child application context
return logout request to be application/x-www-form-urlencoded
Merge pull request #659 from Unicon/issue#656

Ability to include multiple config files for the DispatcherServlet child application context
Merge pull request #662 from skibaa/CAS-657-new

return logout request to be application/x-www-form-urlencoded
cas-663: Both log4j-over-slf4j.jar and slf4j-log4j12.jar in the management webapp