Ajout de transitions
Conflits résolus
Merge branch 'master' of https://github.com/floriansegginger/pimpmywall