Resolves CROSSDATA-301
Merge branch 'release/0.1.1' of https://github.com/Stratio/crossdata into develop