Merge remote-tracking branch 'origin/master'

Conflicts:
	Star Crossing/Library/CurrentLayout.dwlt

I actually don't remember what these were