Reenable layer groups
Merge branch 'master' into feature/layer_groups
Change group name to show layer name
Merge branch 'feature/layer_groups', fixes #2.