add userServer.h
Merge origin/master