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

Conflicts:
	Unity/Assets/Scenes/connectionScreen.unity
	Unity/Assets/Scenes/level1.unity
	Unity/Assets/Scenes/level2.unity
	Unity/Assets/Scenes/level3.unity
	Unity/Assets/Scenes/level4.unity
	Unity/Assets/Scenes/level5.unity
	Unity/Assets/Scenes/menu.unity
	Unity/Library/EditorUserBuildSettings.asset
	Unity/Library/InspectorExpandedItems.asset
	Unity/Library/ScriptAssemblies/Assembly-CSharp.dll
	Unity/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Unity/Library/assetDatabase3
	Unity/Library/expandedItems
	Unity/Library/guidmapper
	Unity/ProjectSettings/EditorBuildSettings.asset
	Unity/ProjectSettings/TagManager.asset