undoing incorrect merge
Merge pull request #213 from DevYah/C4_Gezeery_#52_view_user_profile2_master_edit

undoing incorrect merge