allows json serviceRegistryDao to be the default option
added sample config
added unique ids
added json service registry dao to mgmt app
fixed serviceid patterns and corrected comment
Jdk7 - new diamon operator syntax
Merge branch 'master' into jdk7-diamond-op

Conflicts:
	cas-server-core/src/main/java/org/jasig/cas/services/JsonServiceRegistryDao.java
	cas-server-support-ldap/src/test/java/org/jasig/cas/util/LdapTestUtils.java
Merge pull request #816 from Unicon/jdk7-diamond-op

JDK7 - new diamon operator syntax
Merge pull request #814 from Unicon/default-json-svc-reg

JSON Service Registry now made default
Merge branch 'master' into checkstyle-security-issues

Conflicts:
	cas-server-core/src/test/java/org/jasig/cas/ticket/registry/DistributedTicketRegistryTests.java