misc
Merge remote-tracking branch 'origin/David'

Conflicts:
	Assets/paths/tuto.prefab
minor change player
Merge remote-tracking branch 'origin/David'
merge master on david