Fixer les bugs de sprint 4

Merged naji requested to merge fix/sprint4_150322 into develop

Merge request reports