Master Template Changes

Added all Companions, Villains, and Doctors.