Merged add-photos branch