fixed conflicts errors #157 #160
fixed conflicts and all working #157 #160
Merge pull request #280 from yousraHazem/c2_sama_create_delete_leave_group_sp2

fixed conflicts errors #157 #160
Merge branch 'master' into c3_yasmin_budget_new2
resolved conflicts #151