Update messages_es.properties
Merge pull request #247 from albertocabello/master

Updated messages_es.properties
Checkstyle fixes to make the build behave.
OAuth tests fixed. Decided to remove the static logger from tests, as it ties the logging messages of classes to tests.
Removed blank line.
Merge pull request #249 from Unicon/NOJIRA-OAUTH-TESTS

NOJIRA-OAuth-Tests: Fixes OAuth test failures
Merge branch 'master' into NOJIRA-STATICVARS-WHITESPACE

Conflicts:
	cas-server-core/src/test/java/org/jasig/cas/ticket/registry/AbstractRegistryCleanerTests.java
	cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AccessTokenController.java
	cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeController.java
	cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20ProfileController.java
	cas-server-support-oauth/src/test/java/org/jasig/cas/support/oauth/web/OAuth20AccessTokenControllerTests.java
	cas-server-support-oauth/src/test/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeControllerTests.java
	cas-server-support-oauth/src/test/java/org/jasig/cas/support/oauth/web/OAuth20ProfileControllerTests.java
CAS-1308: Enable explicit registration of OAuth clients in service registry in OAuth server mode
CAS-1307: removing versions from the xsd declarations.
CAS-1307: removing versions from the xsd declarations.
CAS-1307: removing versions from the xsd declarations.
Merge pull request #251 from Unicon/CAS-1308

CAS-1308: Enable explicit registration of OAuth clients in service registry
Merge pull request #252 from Unicon/CAS-1307-NO-XSD-VER

CAS-1307: Removed spring version #s from context XSD declarations
Merge branch 'master' into NOJIRA-STATICVARS-WHITESPACE

Conflicts:
	cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/OAuthUtils.java
	cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/services/OAuthRegisteredService.java
	cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AccessTokenController.java
	cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20AuthorizeController.java
	cas-server-support-oauth/src/main/java/org/jasig/cas/support/oauth/web/OAuth20CallbackAuthorizeController.java
Fixed merge errors
Added checks for license header checking. Fixed one.