Assets Updated

1
Merge branch 'master' of https://github.com/linshan003/MegaMIND.TombRaider

Conflicts:
	Unity_Project/ProjectSettings/AudioManager.asset
	Unity_Project/ProjectSettings/DynamicsManager.asset
	Unity_Project/ProjectSettings/EditorBuildSettings.asset
	Unity_Project/ProjectSettings/EditorSettings.asset
	Unity_Project/ProjectSettings/InputManager.asset
	Unity_Project/ProjectSettings/ProjectSettings.asset
	Unity_Project/ProjectSettings/QualitySettings.asset
	Unity_Project/ProjectSettings/TagManager.asset