Spawner Settings
resolving conflict in tilemanager (funny!)

Conflicts:
	Assets/src/server/TileManager.cs
merging branch from remote (chosko's mods)