move photo
Merge branches 'master' and 'photo_edit'