sorts out merge conflict for #343

Fixes magistrate starting loc
Alien Tweaks, Commented Out Detomatix
Merge pull request #346 from VampyrBytes/master

sorts out merge conflict for #343
Merge pull request #345 from SamCroswell/master

Alien Tweaks, Commented Out Detomatix
Merge remote-tracking branch 'upstream/master'

Resolved Conflicts:
	maps/cyberiad.dmm (Added in a Magistrate Spawn Point i nthe same location as pull #343)