Updated contrib modules ctools and Entity API