code reformated
Merge branch 'deep-refactor-different' of github.com:Stratio/stratio-deep into deep-refactor-different