[merge] added missing NSString categories