ClientSSHDaemonService
confict
conflict
Merge branch 'master' of https://github.com/haijunq/dblike

Conflicts:
	nbproject/project.properties