Merge branch 'develop' of https://github.com/ndomar/megasoft-14 into C1_mohamedbassem_#22_member_invite_member

Conflicts:
	Entangle/entangle-android/AndroidManifest.xml