Clean .DS_Store files and add grouper support
Merge branch 'jellybean' of https://github.com/BeerGangProject/vendor_beergang into jellybean