awesoem fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	MagicKlonSak/Library/CurrentLayout.dwlt
	MagicKlonSak/Library/ScriptAssemblies/Assembly-CSharp.dll
	MagicKlonSak/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	MagicKlonSak/Library/assetDatabase3
	MagicKlonSak/Temp/UnityTempFile-07961be8c383560499be1c05a6b0fc99
	MagicKlonSak/Temp/UnityTempFile-0abc855f93891354ab78512554785559
	MagicKlonSak/Temp/UnityTempFile-0d397753a319ece4cabea1f943ab8e54
	MagicKlonSak/Temp/UnityTempFile-1347baeca139c614eb89a3682c92fa7b
	MagicKlonSak/Temp/UnityTempFile-17cb34e7785a7574d87d1570dbc744cd
	MagicKlonSak/Temp/UnityTempFile-29a77ef874b493147ac3c9259e811df5
	MagicKlonSak/Temp/UnityTempFile-29ec91b94a1843f47bba7e92a8eb2656
	MagicKlonSak/Temp/UnityTempFile-313fa6114eec70e4ebc50f559ba7b6cd
	MagicKlonSak/Temp/UnityTempFile-3c2d5377f3c75a44ea7be23f3c7933d3
	MagicKlonSak/Temp/UnityTempFile-550612a5fb5a4594ab6b6688cfbe5c01
	MagicKlonSak/Temp/UnityTempFile-5fe93148ec21d1c4d96ebcc750709e4b
	MagicKlonSak/Temp/UnityTempFile-6040baa7dd8680e49940e6b74e2a9aa6
	MagicKlonSak/Temp/UnityTempFile-6bd09a5b0bec1224a96c2009efe4f8ef
	MagicKlonSak/Temp/UnityTempFile-6f197998d52c1f84c917883302272e92
	MagicKlonSak/Temp/UnityTempFile-6f21c2c7c376c444d890a95479d7b3b1
	MagicKlonSak/Temp/UnityTempFile-6f2fd1bbcceb3754e8f11e5e2f84f29e
	MagicKlonSak/Temp/UnityTempFile-715a65612839654468a3f01c1620dc35
	MagicKlonSak/Temp/UnityTempFile-72892649885cdfd4aa24d8ad006b90f9
	MagicKlonSak/Temp/UnityTempFile-7b23b294c707f4c448612d02afecbe96
	MagicKlonSak/Temp/UnityTempFile-80d97352864be3040a514549895b1d76
	MagicKlonSak/Temp/UnityTempFile-891c5eadd4a9193468aebecc6a51a24f
	MagicKlonSak/Temp/UnityTempFile-9aa5ad71665e42d45b664aadfc18cef1
	MagicKlonSak/Temp/UnityTempFile-9d03527ba8fffc743974b2143997facb
	MagicKlonSak/Temp/UnityTempFile-a0bdb39add892a64aa51fa562a7b6354
	MagicKlonSak/Temp/UnityTempFile-a5513a2210c04474fa3bd65fe4f4c1cd
	MagicKlonSak/Temp/__EditModeScene