Updated photo
Merge branch 'master' into feature/assets
Optimised photo