Fix issue #25
Merge branch 'develop' of https://github.com/Stratio/stratio-ingestion into develop