Add regex support to Query
Merge branch 'develop' of https://github.com/MicrosmartSA/ubiquity-ui into develop