Update 12/8

-Can't even remember making changes tbh
Merge remote-tracking branch 'origin/master'

Conflicts:
	Star Crossing/Library/CurrentLayout.dwlt
	Star Crossing/Library/CurrentMaximizeLayout.dwlt
	Star Crossing/Library/ScriptAssemblies/Assembly-CSharp.dll
	Star Crossing/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Star Crossing/Library/assetDatabase3
	Star Crossing/Library/expandedItems
	Star Crossing/Library/guidmapper
	Star Crossing/Library/metadata/0c/0cd3cc5c4a7285a439038803388ef589
	Star Crossing/Library/metadata/13/1319cc7a4d84fa544a4522f554dad20f
	Star Crossing/Library/metadata/13/13bc1ad722914174db1965c3136f934f
	Star Crossing/Library/metadata/4f/4fe2ffb819d5402429bbefab95176b06
	Star Crossing/Library/metadata/9d/9dc594f38b3cfef4196bfabe355cdef4
	Star Crossing/Library/metadata/aa/aaebdf9f8517cb14295d4e6e86105ba4
	Star Crossing/Library/metadata/b4/b498fd5fd8dad9f4cbc2978962886629
	Star Crossing/Library/metadata/d7/d70436405fa08264f94400e8fd7d3248
	Star Crossing/Library/metadata/f6/f62bf7c507bda174b8a75fc4707ab336
	Star Crossing/Library/metadata/fa/fa5941cf0f934e146bf7669786f9edfd
	Star Crossing/Star Crossing.userprefs