adsfd
confile

Merge branch 'user' of https://github.com/AntShakeTree/VDI into origin/user

Conflicts:
	vdi-core-server-lls-730/src/main/java/com/vdi/dao/suport/LdapHelp.java
	vdi-core-server-lls-730/src/main/java/com/vdi/dao/suport/LdapSupport.java
	vdi-core-server-lls-730/src/main/java/com/vdi/dao/user/domain/Domain.java
	vdi-core-server-lls-730/src/main/java/com/vdi/facade/impl/DomainFacadImpl.java
	vdi-core-server-lls-730/target/classes/com/vdi/dao/suport/LdapHelp.class
	vdi-core-server-lls-730/target/classes/com/vdi/dao/user/domain/Domain.class