um module 覆盖率提升到了75%左右，今天解决了从外界DB同步组织用户的Test，明天解决从LDAP同步的Test。
Merge branch 'master' of https://github.com/waitwind/jinhe-daodao

Conflicts:
	framework/src/test/java/com/jinhe/tss/framework/sso/SSOIntegrateTest.java
	um/src/main/java/com/jinhe/tss/um/UMConstants.java
	um/src/main/java/com/jinhe/tss/um/entity/Application.java
	um/src/main/java/com/jinhe/tss/um/syncdata/SyncDataHelper.java
	um/src/main/resources/template/syncdata/template_DB.xml
	um/src/test/java/com/jinhe/tss/um/syncdata/SyncdataTest.java