OEE-346: entityManagement grid column 'Organization'
Merge remote-tracking branch 'origin/master' into ticket/OEE-346
OEE-356: Override NavigationListener
OEE-356: Review fixes
Merge remote-tracking branch 'origin/master' into ticket/OEE-346
Merge branch 'ticket/OEE-346' into ticket/OEE-353
Merge pull request #2786 from laboro/ticket/OEE-346

Ticket/OEE 346
Merge remote-tracking branch 'origin/master' into feature/OEE-34_entities_organization
Merge remote-tracking branch 'origin/feature/OEE-34_entities_organization' into ticket/OEE-356
Merge branch 'feature/OEE-34_entities_organization' of github.com:laboro/platform into ticket/OEE-356
Merge remote-tracking branch 'origin/master' into feature/OEE-34_entities_organization
OEE-356: Reworked navigation listener
Merge branch 'ticket/OEE-356' of github.com:laboro/platform into ticket/OEE-356
Merge pull request #2785 from laboro/ticket/OEE-356

OEE-356: Override NavigationListener
OEE-350: override CustomEntityType
Merge branch 'feature/OEE-34_entities_organization' of github.com:laboro/platform into ticket/OEE-353
Merge remote-tracking branch 'origin/master' into feature/OEE-34_entities_organization
Merge remote-tracking branch 'origin/feature/OEE-34_entities_organization' into ticket/OEE-350
OEE-350: CustomEntityType
Merge pull request #2814 from laboro/ticket/OEE-350

Ticket/OEE-350  forms for custom field per organization (depends on config parameter)