Issue #169 - fix conflicts & try with server
Issue #169 - fix logout to standards UX
Issue #169 - fix conflicts to merge
Issue #169 - fix conflicts to merge in develop
Merge branch 'develop' of https://github.com/ndomar/megasoft-14 into C2_maisaraFarahat_#2_UserLogout
Issue #169 - add documentation for logout in generalProfile
Merge pull request #376 from ndomar/C2_maisaraFarahat_#2_UserLogout

S[2]:Logout
Merge branch 'develop' of github.com:ndomar/megasoft-14 into c5_MohamedShaban_integrate_notification