closes #110
Merge branch 'feature/110-additonal-butler-products' into dev
closes #111
Merge branch 'feature/111-geom-area-header-label' into dev