preparing to merge add-photos with master