Merge pull request #59 from MGhanem/fixing_final_conflicts

Fixing conflicts
Merge pull request #60 from MGhanem/c1_khloud_frameworktask_s12

khloud finished s12: functional but not done
Zoheiry cleaned up a few things
Merge branch 'c1_dummy_master' of https://github.com/MGhanem/smartsoft-13 into cleaning_up_new
More cleanUps
Merge pull request #62 from MGhanem/c1_khloud_frameworktask_fixing_final_errors

khloud fixed deleting and sharing errors
Fixed Conflicts, everything cleaned up, everything functional
Merge pull request #63 from MGhanem/isA_yekoon_2a5er_branch

Allahoma tawelik ya roo7
khloud fixed url errors in editing tasks