Weak  Floor and Fire
Merge branch 'dev' of git:2014/JV_PFE_2014_2015/ChevalierWestern into dev
Version propre sur dev
gitignore with perso folders
Merge branch 'dev'

Conflicts:
	Assets/Material/Perso/Gold.mat
	Assets/Material/Perso/Red.mat
	Assets/Prefabs/Enemy.prefab
	Assets/Prefabs/Perso/Character_Louis.prefab
	Assets/Proto/ActivableElement.cs
	Assets/Scripts/CameraBehaviour.cs
	Assets/Scripts/Hotspots/ActionSpot.cs
	Assets/Scripts/Hotspots/GoToSpot.cs
	Assets/Scripts/Hotspots/Hotspot.cs
	Assets/Scripts/Hotspots/RatioSpot.cs
	Assets/Sources/ActivableElement.cs
	Assets/Sources/Camera/CameraBehaviour.cs
	Assets/Sources/Camera/Hotspots/ActionSpot.cs
	Assets/Sources/Camera/Hotspots/GoToSpot.cs
	Assets/Sources/Camera/Hotspots/Hotspot.cs
	Assets/Sources/Camera/Hotspots/RatioSpot.cs
	Assets/Sources/CameraBehaviour.cs
	Assets/Sources/Hotspots/ActionSpot.cs
	Assets/Sources/Hotspots/GoToSpot.cs
	Assets/Sources/Hotspots/Hotspot.cs
	Assets/Sources/Hotspots/LaunchZone.cs
	Assets/Sources/Hotspots/RatioSpot.cs
	Assets/Sources/Perso/ActivableElement.cs
	Assets/Sources/Perso/Toto.cs
	Assets/Textures/Perso/target.png
removing files in doble
weak floor
Character pour que thibault règle le saut
character pour que Thibaut definisse le saut