Merge remote-tracking branch 'origin/Alina' into George2

Conflicts:
	Assets/Scenes/mainScene.unity
	Assets/Scripts/mapCreatorScript.cs
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/3f/3fb590a78a1f6f144ae36b7e70988d28
	Library/metadata/b0/b0b6bf4e8f6f542458e8fcacec54f338
	YADC.userprefs