changes in AddEdit Folder,AppDelgate
changes  in AppDelgate
Merge remote-tracking branch 'origin/master'