Calcul score
Merge branch 'Collectibles'

Conflicts:
	KTH-sources/Assembly-CSharp-Editor-vs.csproj
	KTH-sources/Assembly-CSharp-Editor.csproj
	KTH-sources/Assembly-CSharp-firstpass-vs.csproj
	KTH-sources/Assembly-CSharp-firstpass.csproj
	KTH-sources/Assembly-CSharp-vs.csproj
	KTH-sources/Assembly-CSharp.csproj
	KTH-sources/Assembly-CSharp.pidb
	KTH-sources/Assets/AstarPathfindingProject/Editor/EditorAssets/Materials/Navmesh.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Animations/dynamicObstacle.anim
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Example1_Grid/GridGraphExample.unity
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Example2_Terrain/Example2.unity
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Example5_PointGraph/ListCubes.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Example5_PointGraph/ListGraphExample.unity
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Example5_PointGraph/blackText.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Example5_PointGraph/ex5Ground.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Example6_Navmesh/Materials/navmesh-navmesh_example6navmeshMat.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Example6_Navmesh/NavmeshExample.unity
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Example9_Penalties/PenaltiesExample.unity
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Materials/AI.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Materials/BlueBox.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Materials/BlueGround.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Materials/Door.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Materials/Ground.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Materials/GroundRTS.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Materials/OrangeGround.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Materials/PathBlueArea.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Materials/PathGreyCube.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Materials/PathRedArea.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Materials/PlayerShadow.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Materials/SomeBox.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Materials/Wall.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/Bot.prefab
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot-01 - Default.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot-minebot.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@awake-01 - Default.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@back-01 - Default.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@forward-01 - Default.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@left-01 - Default.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@right-01 - Default.mat
	KTH-sources/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/SomeBox.prefab
	KTH-sources/KTH-sources-csharp.sln
	KTH-sources/KTH-sources.sln
	KTH-sources/KTH-sources.userprefs
	KTH-sources/Library/AssetServerCacheV3
	KTH-sources/Library/assetDatabase3
	KTH-sources/Library/guidmapper
Calcul de score
Merge branch 'master' of https://github.com/Erendil/Kitchen-Treasure-Hunt
Leaderboard + Colelctibles dans la map
Merge branch 'master' of git@github.com:Erendil/Kitchen-Treasure-Hunt.git into assetBundleFinal

Conflicts:
	KTH-sources/Assets/Ressources/main.unity
master ok

Signed-off-by: Maxens Dubois <maxens.dubois@gmail.com>