database changes
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/library/UserFunctions.java
	out/production/NavigationDrawer/Fragments/OtherOne.class
	out/production/NavigationDrawer/Fragments/OtherTwo.class
	out/production/NavigationDrawer/Fragments/PedestrianA.class
	out/production/NavigationDrawer/Fragments/PedestrianB.class
	out/production/NavigationDrawer/Fragments/PedestrianC.class
	out/production/NavigationDrawer/Fragments/VehicleOnePassengerOneScreenSlide.class
	out/production/NavigationDrawer/Fragments/VehicleOnePassengerThree.class
	out/production/NavigationDrawer/Fragments/VehicleOnePassengerTwo.class
	out/production/NavigationDrawer/Fragments/VehicleTwoPassengerOne.class
	out/production/NavigationDrawer/Fragments/VehicleTwoPassengerThree.class
	out/production/NavigationDrawer/Fragments/VehicleTwoPassengerTwo.class
	out/production/NavigationDrawer/Fragments/Witness.class
	out/production/NavigationDrawer/NavigationDrawer.apk
	out/production/NavigationDrawer/NavigationDrawer.unaligned.apk
	out/production/NavigationDrawer/adapters/ATCgridAdapter.class
	out/production/NavigationDrawer/adapters/SpinnerAdapter.class
	out/production/NavigationDrawer/adapters/VehicleTwoTypeGridViewAdapter.class
	out/production/NavigationDrawer/adapters/VehicleTypeGridViewAdapter.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$NetCheck.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$ProcessDriver1.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$ProcessDriver2.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$ProcessInsurance1Data.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$ProcessInsurance2Data.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$ProcessLocationData.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$ProcessPassengerDB.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$ProcessSpinnerrDB.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$ProcessVehicle1Data.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$ProcessVehicle2Data.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$Processdamage1Data.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification$Processdamage2Data.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AccidentTypeclassification.class
	out/production/NavigationDrawer/com/rsmsa/accapp/Atc.class
	out/production/NavigationDrawer/com/rsmsa/accapp/AtcSelect.class
	out/production/NavigationDrawer/com/rsmsa/accapp/MainActivity$CustomActionBarDrawerToggle.class
	out/production/NavigationDrawer/com/rsmsa/accapp/MainActivity.class
	out/production/NavigationDrawer/com/rsmsa/accapp/NsMenuAdapter.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$EditTextWatcher.class
	out/production/NavigationDrawer/com/rsmsa/accapp/ScreenSlidePageFragment.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/VehicleType.class
	out/production/NavigationDrawer/com/rsmsa/accapp/Witness.class
	out/production/NavigationDrawer/com/rsmsa/accapp/library/UserFunctions.class
merge chnages