[Misc] Fix Server.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/vance/perfService/Server.java