resolve warnings in scala style develop.
Merge branch 'develop' of github.com:Stratio/crossdata into develop
Merge branch 'develop' of github.com:Stratio/crossdata into develop