Merge the GO changes dfighter2->Master part 6

ADDED: GO_Trap class. This class will now handle traps.