Issue #325 - changing hardcoded links to Config.API_BASE_URL
Issue #325 - Changing the global API variable
Merge branch 'frontend_integration' of github.com:ndomar/megasoft-14 into C1_mohamedbassem_#X_migrating_to_server

Conflicts:
	Entangle/entangle-android/src/com/megasoft/entangle/FilteringFragment.java
	Entangle/entangle-android/src/com/megasoft/entangle/ProfileActivity.java
	Entangle/entangle-android/src/com/megasoft/entangle/megafragments/TangleFragment.java
Merge branch 'develop' of github.com:ndomar/megasoft-14 into C1_mohamedbassem_#X_migrating_to_server
Merge branch 'develop' of github.com:ndomar/megasoft-14 into C1_mohamedbassem_#X_migrating_to_server

Conflicts:
	Entangle/entangle-android/AndroidManifest.xml
	Entangle/entangle-android/bin/AndroidManifest.xml
	Entangle/entangle-android/res/values/dimens.xml
	Entangle/entangle-android/res/values/strings.xml
	Entangle/entangle-android/src/com/megasoft/config/Config.java
	Entangle/entangle-android/src/com/megasoft/entangle/CreateOfferActivity.java
	Entangle/entangle-android/src/com/megasoft/entangle/HomeActivity.java
	Entangle/entangle-android/src/com/megasoft/entangle/MainActivity.java
	Entangle/entangle-android/src/com/megasoft/entangle/ProfileActivity.java
	Entangle/entangle-android/src/com/megasoft/entangle/megafragments/TangleFragment.java
Issue #325 - Fixing login
Issue #325 - Removing hashing from login
Issue #325 - Working login from server
Issue #325 - switching tangleStream to server
Issue #325 - Working get tangle list from server
Issue #325 - redirect if logged in
Merge branch 'frontend_integration' of github.com:ndomar/megasoft-14 into C1_mohamedbassem_#X_migrating_to_server

Conflicts:
	Entangle/entangle-android/bin/AndroidManifest.xml
Issue #325 - Getting request server
Issue #325 - Add profile
Issue #325 - adding userIDd
Issue #325 - Fixing bugs
Merge branch 'develop' of github.com:ndomar/megasoft-14 into C1_mohamedbassem_#X_migrating_to_server

Conflicts:
	Entangle/entangle-android/AndroidManifest.xml
	Entangle/entangle-android/bin/AndroidManifest.xml
	Entangle/entangle-android/res/values/dimens.xml
	Entangle/entangle-android/res/values/strings.xml
	Entangle/entangle-android/src/com/megasoft/entangle/CreateOfferActivity.java
	Entangle/entangle-android/src/com/megasoft/entangle/HomeActivity.java
	Entangle/entangle-android/src/com/megasoft/entangle/MainActivity.java
	Entangle/entangle-android/src/com/megasoft/entangle/ProfileActivity.java
	Entangle/entangle-android/src/com/megasoft/entangle/megafragments/TangleFragment.java
Issue #325 - Fixing conflicts
Issue #325 - Fixing a typo
Issue #325 - Changing member list to server