conflict solving
rework on userlevel, switched chercheur and moderateur
added a contact panel
csv import for ressources
Merge branch 'paulyves' into development
conflict solving