merging after package renaming
Merge branch 'future/0.1.0' of github.com:Stratio/crossdata into future/0.1.0