AddEdit
Merge remote-tracking branch 'origin/master'
AddEditFolder,PhotGallery
Merge remote-tracking branch 'origin/master'