More logic for normalization added
Merge branch 'future/0.1.0' of https://github.com/Stratio/stratio-meta into future/0.1.0