Fix CROSSDATA-132
Merge branch 'release/0.1.0' of github.com:Stratio/crossdata into release/0.1.0