merge
Merge branch 'master' of https://github.com/issyzac/Accapp
Merge branch 'master' of https://github.com/issyzac/Accapp
merge
merge changes
merge
merge
Merge branch 'master' of https://github.com/issyzac/Accapp

Conflicts:
	.idea/workspace.xml
	app/NavigationDrawer/src/com/rsmsa/accapp/AccidentTypeclassification.java
	app/NavigationDrawer/src/com/rsmsa/accapp/ScreenSlidePageFragmentTwo.java
	app/NavigationDrawer/src/com/rsmsa/accapp/library/UserFunctions.java
	out/production/NavigationDrawer/Fragments/VehicleOnePassengerOneScreenSlide.class
	out/production/NavigationDrawer/NavigationDrawer.apk
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$1.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$2.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$3.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$4.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$NetCheck.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AtcSelect.class
	out/production/NavigationDrawer/com/rsmsa/accapp/MainActivity$1.class
	out/production/NavigationDrawer/com/rsmsa/accapp/MainActivity$2.class
	out/production/NavigationDrawer/com/rsmsa/accapp/MainActivity$CustomActionBarDrawerToggle.class
	out/production/NavigationDrawer/com/rsmsa/accapp/MainActivity$DrawerItemClickListener.class
	out/production/NavigationDrawer/com/rsmsa/accapp/MainActivity.class
	out/production/NavigationDrawer/com/rsmsa/accapp/NsMenuAdapter.class
	out/production/NavigationDrawer/com/rsmsa/accapp/Passenger$1.class
	out/production/NavigationDrawer/com/rsmsa/accapp/Passenger$PedestrianScreenSlidePagerAdapter.class
	out/production/NavigationDrawer/com/rsmsa/accapp/Passenger$ScreenSlidePagerAdapter.class
	out/production/NavigationDrawer/com/rsmsa/accapp/Passenger.class
	out/production/NavigationDrawer/com/rsmsa/accapp/R$id.class
	out/production/NavigationDrawer/com/rsmsa/accapp/R$layout.class
	out/production/NavigationDrawer/com/rsmsa/accapp/R$menu.class
	out/production/NavigationDrawer/com/rsmsa/accapp/R$string.class
	out/production/NavigationDrawer/com/rsmsa/accapp/R$style.class
	out/production/NavigationDrawer/com/rsmsa/accapp/R.class
	out/production/NavigationDrawer/com/rsmsa/accapp/ScreenSlidePageFragment$1.class
	out/production/NavigationDrawer/com/rsmsa/accapp/ScreenSlidePageFragment$2.class
	out/production/NavigationDrawer/com/rsmsa/accapp/ScreenSlidePageFragment.class
	out/production/NavigationDrawer/com/rsmsa/accapp/ScreenSlidePageFragmentTwo$1.class
	out/production/NavigationDrawer/com/rsmsa/accapp/ScreenSlidePageFragmentTwo$2.class
	out/production/NavigationDrawer/com/rsmsa/accapp/ScreenSlidePageFragmentTwo.class
	out/production/NavigationDrawer/com/rsmsa/accapp/Vehicle1.class
	out/production/NavigationDrawer/com/rsmsa/accapp/Vehicle2.class
	out/production/NavigationDrawer/com/rsmsa/accapp/library/UserFunctions.class
merge changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/NavigationDrawer/src/com/rsmsa/accapp/AccidentTypeclassification.java
	out/production/NavigationDrawer/Fragments/VehicleTwoPassengerOne.class
	out/production/NavigationDrawer/Fragments/Witness.class
	out/production/NavigationDrawer/NavigationDrawer.apk
	out/production/NavigationDrawer/NavigationDrawer.unaligned.apk
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$NetCheck.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$ProcessPassengerDB.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification.class
	out/production/NavigationDrawer/com/rsmsa/accapp/library/DatabaseHandler.class
merge