commi
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	ClasseCommunes/CustomMessage.cs
	TCPServer/Server.cs