update
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/gem_color.png.meta
	Assets/test.txt.meta
	ProjectSettings/AudioManager.asset
	ProjectSettings/DynamicsManager.asset
	ProjectSettings/EditorBuildSettings.asset
	ProjectSettings/EditorSettings.asset
	ProjectSettings/GraphicsSettings.asset
	ProjectSettings/InputManager.asset
	ProjectSettings/NavMeshLayers.asset
	ProjectSettings/NetworkManager.asset
	ProjectSettings/Physics2DSettings.asset
	ProjectSettings/ProjectSettings.asset
	ProjectSettings/QualitySettings.asset
	ProjectSettings/TagManager.asset
	ProjectSettings/TimeManager.asset