lantern

Added the lantern, enables the light in the cave
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjectSettings/EditorBuildSettings.asset