music
Merge branch 'origin/develop'

Conflicts:
	tojam/Assets/Audio.meta
	tojam/Assets/Audio/Music.meta
	tojam/Assets/Audio/Music/SJ_Mellia_-_01_-_01_reverseselector.mp3.meta
	tojam/Assets/Audio/Music/SJ_Mellia_-_04_-_04_bytemarks.mp3.meta
	tojam/Assets/Audio/Music/SJ_Mellia_-_05_-_05_supaunlimita.mp3.meta
	tojam/Assets/Audio/SFX.meta
	tojam/Assets/Audio/SFX/151022__bubaproducer__laser-shot-silenced.wav.meta
	tojam/Assets/Audio/SFX/165147__rhythmpeople__rpeople-blaster-02.wav.meta
	tojam/Assets/Audio/SFX/69757__syna-max__recognizer.wav.meta
	tojam/Assets/Audio/SFX/69764__syna-max__lightcycle.wav.meta
	tojam/Assets/Audio/SFX/69966__syna-max__derezz-sounds_A.wav.meta
	tojam/Assets/Audio/SFX/69966__syna-max__derezz-sounds_B.wav.meta
	tojam/Assets/Audio/SFX/69966__syna-max__derezz-sounds_C.wav.meta
	tojam/Assets/Audio/SFX/69966__syna-max__derezz-sounds_D.wav.meta
	tojam/Assets/Audio/SFX/69966__syna-max__derezz-sounds_E.wav.meta
	tojam/Assets/Audio/SFX/69966__syna-max__derezz-sounds_F.wav.meta
	tojam/Assets/Audio/SFX/69967__syna-max__synth-amb.ogg.meta
	tojam/Assets/Model/key.FBX.meta
	tojam/Assets/Model/keyHole.FBX.meta
	tojam/Assets/Textures/ForceFieldTexture.png.meta
	tojam/Assets/Textures/ForceFieldTexture_orange.png.meta
	tojam/Assets/Textures/ForceFieldTexture_red.png.meta
	tojam/Assets/Textures/keyHoleLightingMap.tga.meta
	tojam/Assets/Textures/keyLightingMap.tga.meta
last changes
settings
Merge branch 'origin/develop'

Conflicts:
	tojam/Assets/Audio/SFX/31822__ihatetoregister__blip.flac.meta
	tojam/Assets/Textures/keyHoleLightingMap_v2.png.meta
	tojam/Assets/Textures/keyLightingMap_v2.png.meta