consistency across views when retrieving objects and/or rendering views
consistency across views when retrieving objects and/or rendering views
break authenticationViaFormAction into smaller pieces for extensions
Upgrading Ehcache to 2.9
accounted for feedback. reorganized class
restored setter
wrote unit tests, accounted for feedback
Merge pull request #729 from Unicon/ehcache-upgrade

Upgrading Ehcache to 2.9
Merge pull request #728 from Unicon/authn-via-form-breakdown

Break up AuthenticationViaFormAction for extensions
Merge pull request #727 from Unicon/saml-attr-common-views

Attributes in SAML View Filtered by Attribute Policy
Merge branch 'master' into casapi-return-tcktclasses

Conflicts:
	cas-server-core/src/main/java/org/jasig/cas/web/flow/AuthenticationViaFormAction.java
	cas-server-webapp-support/src/test/java/org/jasig/cas/web/AbstractServiceValidateControllerTests.java
fixed merge issues