NXCALS-1525 Added multi entity query

Tiago Martins Ribeiro requested to merge feature-NXCALS-1525-multiple-entity-query into develop Mar 16, 2018