Make UI factories more flexible
Move Session context manager to its own module
Merge pull request #605 from elyezer/improve-ui-org-factory

Make UI factories more flexible