changed default port too
Merge remote-tracking branch 'origin/master'

Conflicts:
	TDGame/ClientForm.Designer.cs