merge latest version of File_Store and Picture_Manipulation