Merge branch 'develop' of https://github.com/Stratio/stratio-meta into groupByFeature
Merge branch 'groupByFeature' of https://github.com/Stratio/stratio-meta into groupByFeature