Pull Request: C5_Khaled_146_Edit_Profile_5.12

Issue #146 
Reviewers: @Husseny @linsara @nadineadel @MussabElDash 

<em>Please don't review this except after merging this #471 </em>