Revert "hum etrange le merge"

This reverts commit bb6ea368230b0d29a5c74ae9330d3ae219eb8ee7.
Réintroduction des model view et controller
Merge branch 'structuregenerale' into developpement
fusion structure