Modifying Storage grammar
Refactoring
Merge branch 'future/0.1.0' of github.com:Stratio/stratio-meta into future/0.1.0