Resolution des conflits
Merge branch 'master' of https://github.com/nbaudetheig/tedxEventManager