gouzingz
Update
Merge branch 'local_guenole_features' into local_dev
Merge branch 'dev' of https://github.com/SimSoccer/SimSoccer into local_dev

Conflicts:
	SIMS.SimSoccerForm/LobbyForm.cs
	Sims.SimSoccerModel/Game.cs
Update