Changed

• Split out subjects and add more checks for VideoSubject
• Update supported version of opencv

Fixed

• #246
  • Fix clean_up_20 to use the correct puppet bot
  • Delete territory__rooms_6 as it is a duplicate of territory__rooms_5