debut de trampoline
aiming lock added to crossbow + fix
Update player prefab with weight manager
Some fix on crossbow
trampoline
Merge branch 'system-louis' into dev

Conflicts:
	Assets/Prefabs/EnemySpawn.prefab
	Assets/Prefabs/Missile.prefab
	Assets/Prefabs/Perso/Character_Thomas.prefab
	Assets/Prefabs/Weak Floor.prefab
prefab enemySpawn
enemy spawn prefab with the script
Merge branch 'dev' of git:2014/JV_PFE_2014_2015/ChevalierWestern into dev
Merge branch 'system-louis' of git:2014/JV_PFE_2014_2015/ChevalierWestern into dev

Conflicts:
	Assets/Prefabs/EnemySpawn.prefab
	Assets/Sources/Enemies/EnemySpawn.cs
Merge branch 'dev' of git:2014/JV_PFE_2014_2015/ChevalierWestern into dev