animation
Merge branch 'master' of https://github.com/Kranchy/Looter
Map 9 et 10
Merge branch 'Anim' of https://github.com/Kranchy/Looter

Conflicts:
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/metadata/9c/9c6ef08519ee72a49b8fbb3a7653f153
	Project/Library/metadata/fb/fb34392bdde58db49beca05a66738793
	Project/Project-csharp.sln
	Project/Project.sln
Nouveau TileSet + sas.tmx
Avant release
Merge branch 'master' of https://github.com/Kranchy/Looter
Merge branch 'Anim' of https://github.com/Kranchy/Looter

Conflicts:
	Project/Assembly-CSharp-vs.csproj
	Project/Assembly-CSharp.csproj
	Project/Assets/Scenes/MainScene.unity
	Project/Assets/Scripts/Humans/Player.cs
	Project/Assets/Scripts/Managers/InputManager.cs
	Project/Assets/Scripts/Obstacles/Sand.cs.meta
	Project/Assets/Sprite/couteauright.png.meta
	Project/Assets/Sprite/flecheright.png.meta
	Project/Library/AssetServerCacheV3
	Project/Library/InspectorExpandedItems.asset
	Project/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/ScriptMapper
	Project/Library/assetDatabase3
	Project/Library/guidmapper
	Project/Library/metadata/00/00092793cc3952042a21ccc100bacfba
	Project/Library/metadata/00/00e8ad033462d454983afcda353e5d98
	Project/Library/metadata/05/057dce51de2108341869903427efec38
	Project/Library/metadata/0c/0c9e718ae5cca7940aca2ba41f21f568
	Project/Library/metadata/23/235c2ad2b3a0e4745a67a367adac1334
	Project/Library/metadata/4a/4ae65d0bca351a546be064224b87dfc8
	Project/Library/metadata/51/519b8af78b2750448baf49b306d59c6b
	Project/Library/metadata/59/597e023ec204a264fa8eb716b35b366c
	Project/Library/metadata/61/61ce43efc40617a4f9bfd159f6f979bd
	Project/Library/metadata/7d/7d62b065f0d09604f899dcb024d26aa8
	Project/Library/metadata/9c/9c6ef08519ee72a49b8fbb3a7653f153
	Project/Library/metadata/ab/ab636176a39e9a9459120e3596885133
	Project/Library/metadata/c2/c2ca50d6297abea409076d93fe8b6500
	Project/Library/metadata/d2/d29286cfa4c90b14484df37402324ee6
	Project/Library/metadata/d9/d9e80bcf3ae071f44a46f06aa1c3c1c4
	Project/Library/metadata/ea/ead9c23d12bb4de4ba9328d3c3320ecd
	Project/Project-csharp.sln
	Project/Project.sln
Avant release
Merge branch 'postRelease' of https://github.com/Kranchy/Looter into Test

Conflicts:
	Project/Assets/Tiled2Unity/Prefabs/map1.prefab.meta
	Project/Assets/Tiled2Unity/Prefabs/map2.prefab.meta
	Project/Assets/Tiled2Unity/Prefabs/map3.prefab
	Project/Assets/Tiled2Unity/Prefabs/map3.prefab.meta
	Project/Assets/Tiled2Unity/Prefabs/map4.prefab.meta
	Project/Assets/Tiled2Unity/Prefabs/map5.prefab.meta
	Project/Assets/Tiled2Unity/Prefabs/map6.prefab.meta
	Project/Assets/Tiled2Unity/Prefabs/map8.prefab.meta
	Project/Assets/Tiled2Unity/Prefabs/underground.prefab.meta
	Project/Assets/mapTiled/map10.tmx.meta
	Project/Assets/mapTiled/map9.tmx.meta
	Project/Library/CurrentLayout.dwlt
	Project/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/ScriptMapper
	Project/Library/assetDatabase3
	Project/Library/expandedItems
	Project/Library/guidmapper
	Project/Library/metadata/a0/a002cce04a71082439b00127f5ebe47a~HEAD
	Project/Library/metadata/cb/cb2655487641895468024d7710055690
	Project/Library/metadata/e6/e603123e464acd8428da8fa8de60502a
	Project/Project-csharp.sln
	Project/Project.sln