modify the nettimeutils
modify the nettimeutils
Merge branch 'MyPersistent' of https://github.com/kaiweicai/locate into
MyPersistent

Conflicts:
	PersistentLocate/config/rfaConfig.properties
work in office for merger
Merge remote-tracking branch 'origin/MyPersistent' into netty4
display the locate server disconnect state
Merge remote-tracking branch 'origin/MyPersistent' into netty4
make the client work with netty4