Lobby

hey
Merge remote-tracking branch 'origin/master'

Conflicts:
	Wars Of Baraxa/Assets/Scripts/script_Acceuil.js
	Wars Of Baraxa/Assets/Scripts/script_Menu.js
	Wars Of Baraxa/Library/CurrentLayout.dwlt
	Wars Of Baraxa/Library/InspectorExpandedItems.asset
	Wars Of Baraxa/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Wars Of Baraxa/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Wars Of Baraxa/Library/assetDatabase3
	Wars Of Baraxa/Library/guidmapper
	Wars Of Baraxa/Library/metadata/b7/b75b6130ecc1ad749a534e4851c2d0f6
	Wars Of Baraxa/Library/metadata/cd/cd55a2cc79c283d40860f8c729da132e
	Wars Of Baraxa/ProjectSettings/EditorBuildSettings.asset
	Wars Of Baraxa/Wars Of Baraxa.userprefs