Save button toggles correctly on photo
Merge remote-tracking branch 'origin'