20/5 commit mokhtar
24-5
Merge branch 'master' of
https://github.com/mokhtar-ahmed/CarpoolingMobile.git

Conflicts:
	bin/CarpoolingV1.apk
	bin/classes.dex
	bin/classes/com/iti/jets/carpoolingV1/R$id.class
	bin/classes/com/iti/jets/carpoolingV1/R$layout.class
	bin/classes/com/iti/jets/carpoolingV1/R$menu.class
	bin/classes/com/iti/jets/carpoolingV1/R$string.class
	bin/classes/com/iti/jets/carpoolingV1/R$style.class
	bin/classes/com/iti/jets/carpoolingV1/addevent/AddEventActivity$1.class
	bin/classes/com/iti/jets/carpoolingV1/addevent/AddEventActivity.class
	bin/classes/com/iti/jets/carpoolingV1/eventshome/CustomBaseAdapter.class
	bin/classes/com/iti/jets/carpoolingV1/eventshome/EventsHome.class
	bin/classes/com/iti/jets/carpoolingV1/eventshome/EventsHomeController.class
	bin/classes/com/iti/jets/carpoolingV1/homeactivity/HomeFragment.class
	bin/classes/com/iti/jets/carpoolingV1/httphandler/AddEvent.class
	bin/classes/com/iti/jets/carpoolingV1/httphandler/HttpConstants.class
	bin/classes/com/iti/jets/carpoolingV1/httphandler/LoginServiceHandler.class
	bin/classes/com/iti/jets/carpoolingV1/httphandler/RetriveAllLocationServiceHandler.class
	bin/classes/com/iti/jets/carpoolingV1/httphandler/RetriveUserEventsHandler.class
	bin/classes/com/iti/jets/carpoolingV1/loginactivity/LoginActivity$1.class
	bin/classes/com/iti/jets/carpoolingV1/loginactivity/LoginActivity$3.class
	bin/classes/com/iti/jets/carpoolingV1/loginactivity/LoginActivity$4.class
	bin/classes/com/iti/jets/carpoolingV1/loginactivity/LoginActivity.class
	bin/classes/com/iti/jets/carpoolingV1/loginactivity/LoginController.class
	bin/classes/com/iti/jets/carpoolingV1/sharedlayout/BaseActivity.class
	bin/classes/com/iti/jets/carpoolingV1/sharedlayout/MainActivity.class
	bin/classes/com/iti/jets/carpoolingV1/sharedlayout/NavDrawerListAdapter.class
	bin/classes/com/iti/jets/carpoolingV1/splashscreen/SplashScreen.class
	bin/classes/com/iti/jets/carpoolingV1/uimanager/UIManagerHandler.class
	bin/dexedLibs/android-support-v4-b1af02a654cd62e25b5a62529ea1f528.jar
	bin/resources.ap_
	gen/com/iti/jets/carpoolingV1/R.java
	res/layout/activity_add_event.xml
	res/layout/activity_event_details.xml
	src/com/iti/jets/carpoolingV1/addevent/AddEventActivity.java
	src/com/iti/jets/carpoolingV1/eventDetails/EventDetailsActivity.java
	src/com/iti/jets/carpoolingV1/eventDetails/EventDetialsController.java
	src/com/iti/jets/carpoolingV1/eventshome/EventsHome.java
	src/com/iti/jets/carpoolingV1/eventshome/EventsHomeController.java
	src/com/iti/jets/carpoolingV1/httphandler/HttpConstants.java
	src/com/iti/jets/carpoolingV1/loginactivity/LoginActivity.java
	src/com/iti/jets/carpoolingV1/loginactivity/LoginController.java
	src/com/iti/jets/carpoolingV1/uimanager/UIManagerHandler.java