'
o
kk
"
nkjlkiop
save
mort vivants
Merge branch 'master' of https://github.com/juliendeville/Lunatic

Conflicts:
	Assets/Game/Prefabs/Decor/Arbres/Arbres_Geant.blend.meta
	Assets/Game/Prefabs/Decor/Arbres/Arbres_Geant.fbx.meta
	Assets/Game/Prefabs/Decor/Arbres/Character_Lunatic Armature Joined_without_skinning.fbx.meta
	Assets/Game/Prefabs/Decor/Materials.meta
	Assets/Game/Prefabs/Decor/Materials/Material #1.mat.meta
	Assets/Game/Prefabs/Decor/Materials/Material #2.mat.meta
	Assets/Game/Prefabs/Son/SoundBank.prefab.meta
	Assets/Game/Prefabs/Son/SoundManager.prefab.meta
	Assets/Gizmos/PlayMakerGUI Icon.tiff.meta
	Assets/Gizmos/PlayMakerGlobals Icon.tiff.meta
	Assets/Gizmos/PlaymakerIcon.tiff.meta
	Assets/Materials.meta
	Assets/Ornamental Flower Set.meta
	Assets/Ornamental Flower Set/Resources.meta
	Assets/Ornamental Flower Set/Resources/Furniture01.meta
	Assets/Ornamental Flower Set/Resources/Furniture01/Materials.meta
	Assets/Ornamental Flower Set/Resources/Furniture01/Textures.meta
	Assets/Ornamental Flower Set/Resources/Furniture01/Textures/Furniture_flowerstand_01_c.tif.meta
	Assets/Ornamental Flower Set/Resources/Furniture01/Textures/Furniture_flowerstand_01_n.tif.meta
	Assets/Ornamental Flower Set/Resources/Furniture01/Textures/Furniture_flowerstand_02_c.tif.meta
	Assets/Ornamental Flower Set/Resources/Furniture01/Textures/Furniture_foliageplant_08_c.tif.meta
	Assets/Ornamental Flower Set/Resources/Furniture01/Textures/Furniture_foliageplant_09_c.tif.meta
	Assets/Plugins/iOS.meta
	Assets/RainFX/Rain_FirstPerson.unity.meta
	Assets/RainFX/Readme.txt.meta
	Assets/RainFX/Resources/Lightmaps/FirstPersonScene/LightmapFar-0.exr.meta
	Assets/RainFX/Resources/Scripts.meta
	Assets/StreamingAssets/Audio/GeneratedSoundBanks/Mac/Bank_Amb.bnk.meta
	Assets/StreamingAssets/Audio/GeneratedSoundBanks/Mac/Bank_Amb.txt.meta
	Assets/StreamingAssets/Audio/GeneratedSoundBanks/Mac/Bank_Fol.txt.meta
	Assets/StreamingAssets/Audio/GeneratedSoundBanks/Mac/English(US)/DynamicDialogue.txt.meta
	Assets/StreamingAssets/Audio/GeneratedSoundBanks/Mac/English(US)/Human.bnk.meta
	Assets/StreamingAssets/Audio/GeneratedSoundBanks/Mac/English(US)/Human.txt.meta
	Assets/StreamingAssets/Audio/GeneratedSoundBanks/Windows.meta
	Assets/StreamingAssets/Audio/GeneratedSoundBanks/Windows/Bank_Amb.txt.meta
	Assets/StreamingAssets/Audio/GeneratedSoundBanks/Windows/English(US).meta
	Assets/Wwise/SWIG/Doc/Manual/android-class.png.meta
	Assets/Wwise/SWIG/Doc/Manual/android-simple.png.meta
	Assets/Wwise/SWIG/Doc/Manual/ch2.1.png.meta
	Assets/Wwise/SWIG/Doc/Manual/swig16.png.meta
	Assets/testing.meta
	Assets/testing/Lvl1.fbm/TerrainLvl1.jpg.meta
	Assets/testing/Materials.meta
	Assets/testing/Standard Assets.meta
	Assets/testing/Standard Assets/Character Controllers/3rd Person Controller.prefab.meta
	Assets/testing/Standard Assets/Character Controllers/First Person Controller.prefab
	Assets/testing/Standard Assets/Character Controllers/First Person Controller.prefab.meta
	Assets/testing/Standard Assets/Character Controllers/Sources/Scripts/FPSInputController.js
	Assets/testing/Standard Assets/Skyboxes/_skybox info.txt.meta