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