Merge commit '6d388483fced4b2e169251247354ea72ebb12fde' into art_integration

Conflicts:
	Assets/LevelDesignImport/New Terrain 1.asset
	Assets/Scenes/LevelDesignNewTextures.unity
	ProjectSettings/TagManager.asset
Merge branch 'visual_effects' into art_integration

Conflicts:
	Assets/Scenes/LevelDesignNewTextures.unity
Delay Boss Health Display
- Delays the point when the boss health UI appears.