Merge Bleeding-Edge into Master

Still in development: Job specific traitor tools.