Merge remote-tracking branch 'origin/dev_chfou' into dev_sams

Conflicts:
	Project/Assets/Animations.meta
	Project/Assets/script/Game.cs
	Project/Assets/script/Player.cs
	Project/ProjectSettings/QualitySettings.asset
	Project/ProjectSettings/TagManager.asset

lvl1 v7
commit level1 ver7