Added group type settings
Merge branch 'master' of https://github.com/invertedtomato/ChERP.git