modif
Merge branch 'master' of https://github.com/Nizar89/MycoseBucale

Conflicts:
	ProjectAsylum/Assets/Model/perso_PNJ.fbm/pnj.png.meta
	ProjectAsylum/Assets/Prefab/PNJ.prefab
	ProjectAsylum/Assets/Scene/TestScene.unity
	ProjectAsylum/Assets/Script/PNJBehavior.cs