Merge pull request #43 from EmaInfres5ED/valentinDev

Valentin dev
Corrected unitary test
Updated layout of export page
Merge remote-tracking branch 'origin/master' into valentinDev