add grouper
Merge remote-tracking branch 'upstream/jb-grouper' into jb4.2.2

Because i want to readd this device