possible pression test
camera hotspot better archi
Merge branch 'master' of git:2014/JV_PFE_2014_2015/ChevalierWestern into dev

Conflicts:
	Assets/Sources/Hotspots/GoToSpot.cs
	Assets/Sources/Hotspots/Hotspot.cs
version of the presentation
Merge branch 'master' of ssh://progisart.fr:2424/2014/JV_PFE_2014_2015/ChevalierWestern into dev

Conflicts:
	Assets/Prefabs/Player.prefab
	Assets/Prefabs/Target.prefab
	Assets/Scenes/3C.unity
correction of lambert1