Issue #160 - integrate server and edit UI
Merge branch 'develop' of https://github.com/ndomar/megasoft-14 into C2_Almgohar_#9_ViewOffer
Issue #160 - Add new UI
Issue #160 - Integrate server
Merge branch 'develop' of https://github.com/ndomar/megasoft-14 into C2_Almgohar_#9_ViewOffer
Issue #160 - Edit Strings.xml
Issue #169 - fix conflicts & try with server
Issue #160 - Edit UI
Issue #169 - fix logout to standards UX
Issue #169 - fix conflicts to merge
Issue #169 - fix conflicts to merge in develop
Issue #160 - Finalize UI
Issue #160 - Fix Conflict
Merge branch 'develop' of https://github.com/ndomar/megasoft-14 into C2_Almgohar_#9_ViewOffer
Merge pull request #381 from ndomar/C2_Almgohar_#9_ViewOffer

C2 almgohar #9 view offer
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
Issue #371 - Adding AndroidManifest
Issue #371 - pulling develop and solving conflicts