:rename: scoped storage to composite storage, :add: entities2 which uses Context, :add: query parameter in storage.get_elements
Merge branch 'NRPUIV2' of https://github.com/capensis/canopsis into NRPUIV2