json service registry impl - first pass
json service registry impl - first pass
json service registry impl - first pass
json service registry impl - first pass
Merge branch 'master' into CAS-1369

Conflicts:
	cas-server-core/pom.xml
Merge branch 'master' into CAS-1369

Conflicts:
	cas-server-core/src/main/java/org/jasig/cas/services/AbstractRegisteredService.java
	cas-server-core/src/main/java/org/jasig/cas/services/RegexMatchingRegisteredServiceProxyPolicy.java
	cas-server-core/src/main/java/org/jasig/cas/services/support/RegisteredServiceRegexAttributeFilter.java
	pom.xml
testing sample file
cleaned up residual changes
pulled out json mapping into its own class. checked for invalid file names
changed the way services are loaded/saved. removed unneeded load op
fixed toString, verified service deletion before removing it from map
Merge branch 'master' into CAS-1369
fixed formatting issue
fixed cs issues
fixed tests
Merge branch 'master' into CAS-1369
fixed test failure
upgrade to swf 2.4.1
fixed ref references
Merge branch 'master' into spring-webflow-24x

Conflicts:
	pom.xml