Merge branch 'local_dev' into local_ff_create_profile_v3
Merge branch 'local_dev' into local_ff_create_profile_v3
Merge branch 'local_dev' into local_ff_create_profile_v3
add winform that show user the result of his own Match and result of other match
Merge branch 'local_dev' into ft_add_winform_play_journey

Conflicts:
	UserNumber.xml
minor
Merge branch 'ft_add_winform_play_journey' into local_dev
udpate tests
Merge branch 'local_ff_create_profile_v3' into local_dev
Merge branch 'dev' of https://github.com/SimSoccer/SimSoccer into local_dev
modifiation testU
Merge remote-tracking branch 'SimSoccer/dev' into local_dev

Conflicts:
	SIMS.SimSoccerForm/LobbyForm.cs
	SIMS.SimSoccerForm/LobbyForm.resx
add winform to show matchs
Merge branch 'local_dev' into local_guenole_features

Conflicts:
	Sims.SimSoccerModel/Game.cs
gouzingz
Update