Merge branch 'master' into heroku

Conflicts:
	cas-server-webapp/src/main/webapp/WEB-INF/cas.properties
	pom.xml
json service registry impl - first pass
json service registry impl - first pass
json service registry impl - first pass
json service registry impl - first pass
first pass at getting ldap tests to run against inmemory ldap server
first pass at getting ldap tests to run against inmemory ldap server
first pass at getting ldap tests to run against inmemory ldap server
first pass at getting ldap tests to run against inmemory ldap server
first pass at getting ldap tests to run against inmemory ldap server
testing binary attributes
Merge branch 'master' into CAS-1369

Conflicts:
	cas-server-core/pom.xml
Access principal in success view
moved components to core instead
Merge branch 'master' into principal-success-view-669

Conflicts:
	cas-server-webapp/src/main/webapp/WEB-INF/webflow/login/login-webflow.xml
Merge branch 'master' into ldap-server-uboundid

Conflicts:
	cas-server-support-ldap/src/test/java/org/jasig/cas/adaptors/ldap/services/LdapServiceRegistryDaoTests.java
	pom.xml
authn tests passing
authn tests passing
working on unit tests cntd
Merge branch 'master' into principal-success-view-669

Conflicts:
	cas-server-webapp/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml