fixed christophe's photo
Merge branch 'dev' into prod