ok
Merge branch 'beta' of https://github.com/Malth/ProjetKotapak into beta

Conflicts:
	Unity/Assembly-CSharp.pidb
	Unity/Assets/Scenes/ParametersServer.unity
	Unity/Assets/Scenes/connectionScreen.unity
	Unity/Assets/Scripts/ModifyTextFieldScript.cs
	Unity/Library/EditorUserBuildSettings.asset
	Unity/Library/ScriptAssemblies/Assembly-CSharp.dll
	Unity/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Unity/Library/assetDatabase3
	Unity/Library/metadata/70/7086f1bd09654584c921b87501262c5a
	Unity/ProjectSettings/EditorBuildSettings.asset
	Unity/Unity-csharp.sln
	Unity/Unity.sln
	Unity/Unity.userprefs