photo upload fix
Merge branch 'feature'

* feature:
  photo upload fix