Add GetEmbedGroups
tweak token api
Merge branch 'master' into token-settings