optimisation
jpg -> png
Merge branch 'develop'