Starting some spawning changes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unity/Library/assetDatabase3
	Unity/Library/metadata/0a/0aba8612515b7fe45bfe112070d9c100