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 #162 - adding status check
Issue #162 - Switching to fragment
Issue #160 - Edit UI
Merge branch 'develop' of github.com:ndomar/megasoft-14 into C1_mohamedbassem_#18_owner_accept_invitation
Merge branch 'develop' of github.com:ndomar/megasoft-14 into C1_mohamedbassem_#18_owner_accept_invitation
Issue #162 - Adding isTangleOwner
Issue #162 - Passing isTangleOwner in android
Issue #162 - Working tangle management
Merge branch 'develop' of github.com:ndomar/megasoft-14 into C1_mohamedbassem_#18_owner_accept_invitation

Conflicts:
	Entangle/entangle-symfony/public/src/entangle/src/Megasoft/EntangleBundle/Controller/TangleController.php
Issue #162 - Removing mock string
Adding encryption
Merge pull request #378 from ndomar/mailersystem_bugfix

Mailersystem bugfix
Merge pull request #377 from ndomar/C1_mohamedbassem_#18_owner_accept_invitation

S[18] : As a tangle owner, I can accept tangle invitations
Issue #160 - Finalize UI