AssocGroup: group names fix
Device/Associacions bug fix
Merge