token support for organic groups

I don't want to hijack #1058856: Entity tokens not created for multi-value fields because i'm not sure if it's related or not. The patch from #1058856 isn't applying to the current dev anymore and i failed applying it manually because there happens to much i don't really understand. I rolled back in git to a commit in september and applied the patch but still no tokens for OG :( I limited the number of values of the widget to 1 but it's still not working. More info is here: #1088538: OG (Organic Groups) tokens missing.