Issue #168 - add endpoints , login function and whoAmI
Issue #168 - fix the documentation in login php backend
Issue #168 - adding login UI and android logic
Issue #168- fix registration to browser & add details to whoAmI
Issue #168 - fix conflicts
Issue #168 - fix conflicts
Issue #168 - remove commented codes
Issue #168 - fix conflicts to make the API
Merge branch 'el_3mlya_nesr' of https://github.com/ndomar/megasoft-14 into el_3mlya_nesr

Conflicts:
	Entangle/entangle-android/AndroidManifest.xml
	Entangle/entangle-android/bin/AndroidManifest.xml
	Entangle/entangle-android/src/com/megasoft/entangle/HomeActivity.java
	Entangle/entangle-android/src/com/megasoft/entangle/MainActivity.java
Merge login branch