ServerMaster java docs
Merge origin/master