Issue #110 - solving conflicts
Issue #163 - Removing membership endpoint
Issue #163 - Removing membership endpoint from routing
Issue #110 - solving conflicts
Issue #163 - Some modifications to the android activity
Issue #163 - Removing unneeded files
Merge branch 'develop' of github.com:ndomar/megasoft-14 into C1_mohamedbassem_#13_invite_users
Issue #110 - solving conflicts
Issue #110 - solving conflicts
Issue #110 - adding new design
Issue #163 - Adding tangleId
Issue #163 - Done with the layout and fixing bugs
Issue #163 - Fixing styles
fix_Design
Issue #163 - Adding documentation
Merge branch 'develop' of github.com:ndomar/megasoft-14 into C1_mohamedbassem_#13_invite_users

Conflicts:
	Entangle/entangle-android/AndroidManifest.xml
add drawable
Fix conflict
Add xml Design of ClaimForm
Fix string.xml