Some more testing
More commit
Test de merging

Merge branch 'BIGDATA-7' into develop