Update02-1808
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/controller/WSServer.java