btn convert
Revert from this point
Merge branch 'master' of https://github.com/steffanboodhoo/agriExpenseTT

Conflicts:
	AgriExpenseTT-AppEngine/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	AgriExpenseTT-AppEngine/war/WEB-INF/appengine-generated/local_db.bin
	AgriExpenseTT-AppEngine/war/WEB-INF/classes/com/example/agriexpensett/CycleEndpoint.class
	AgriExpenseTT-AppEngine/war/WEB-INF/classes/com/example/agriexpensett/UpAcc.class
	AgriExpenseTT/AndroidManifest.xml
	AgriExpenseTT/bin/AgriExpenseTT.apk
	AgriExpenseTT/bin/AndroidManifest.xml
	AgriExpenseTT/bin/classes.dex
	AgriExpenseTT/bin/classes/.gitignore
	AgriExpenseTT/bin/classes/com/example/agriexpensett/R$integer.class
	AgriExpenseTT/bin/classes/fragments/ChoosePurchase$Confirm.class
	AgriExpenseTT/bin/classes/fragments/ChoosePurchase$MyListAdapter.class
	AgriExpenseTT/bin/classes/fragments/ChoosePurchase.class
	AgriExpenseTT/bin/classes/fragments/FragmentAddData$TWatch.class
	AgriExpenseTT/bin/classes/fragments/FragmentAddData.class
	AgriExpenseTT/bin/classes/fragments/FragmentAddDataLast$Click.class
	AgriExpenseTT/bin/classes/fragments/FragmentAddDataLast.class
	AgriExpenseTT/bin/classes/fragments/FragmentCycleUseCategory$Click.class
	AgriExpenseTT/bin/classes/fragments/FragmentCycleUseCategory$IntentLauncher.class
	AgriExpenseTT/bin/classes/fragments/FragmentCycleUseCategory.class
	AgriExpenseTT/bin/classes/fragments/FragmentEmpty.class
	AgriExpenseTT/bin/classes/fragments/FragmentGeneralCategory$Click.class
	AgriExpenseTT/bin/classes/fragments/FragmentGeneralCategory$IntentLauncher.class
	AgriExpenseTT/bin/classes/fragments/FragmentGeneralCategory.class
	AgriExpenseTT/bin/classes/fragments/FragmentLabourType$Click.class
	AgriExpenseTT/bin/classes/fragments/FragmentLabourType.class
	AgriExpenseTT/bin/classes/fragments/FragmentNewPurchaseOther$Click.class
	AgriExpenseTT/bin/classes/fragments/FragmentNewPurchaseOther.class
	AgriExpenseTT/bin/classes/fragments/FragmentOtherResourceList$Click.class
	AgriExpenseTT/bin/classes/fragments/FragmentOtherResourceList$TWatch.class
	AgriExpenseTT/bin/classes/fragments/FragmentOtherResourceList.class
	AgriExpenseTT/bin/classes/fragments/FragmentPurchaseUse$Click.class
	AgriExpenseTT/bin/classes/fragments/FragmentPurchaseUse$IntentLauncher.class
	AgriExpenseTT/bin/classes/fragments/FragmentPurchaseUse.class
	AgriExpenseTT/bin/classes/fragments/FragmentViewCycles$Confirm.class
	AgriExpenseTT/bin/classes/fragments/FragmentViewCycles$CycleListAdapter.class
	AgriExpenseTT/bin/classes/fragments/FragmentViewCycles.class
	AgriExpenseTT/bin/classes/fragments/FragmentViewResources$Confirm.class
	AgriExpenseTT/bin/classes/fragments/FragmentViewResources.class
	AgriExpenseTT/bin/classes/fragments/Fragment_newpurchaseLast$Click.class
	AgriExpenseTT/bin/classes/fragments/Fragment_newpurchaseLast.class
	AgriExpenseTT/bin/classes/fragments/HireLabourLists.class
	AgriExpenseTT/bin/classes/fragments/NewCycleLists$TWatch.class
	AgriExpenseTT/bin/classes/fragments/NewCycleLists.class
	AgriExpenseTT/bin/classes/fragments/NewPurchaseLists$TWatch.class
	AgriExpenseTT/bin/classes/fragments/NewPurchaseLists.class
	AgriExpenseTT/bin/classes/fragments/fragmentNewCycleLast$1popupClick.class
	AgriExpenseTT/bin/classes/fragments/fragmentNewCycleLast$click.class
	AgriExpenseTT/bin/classes/fragments/fragmentNewCycleLast.class
	AgriExpenseTT/bin/classes/helper/DataManager.class
	AgriExpenseTT/bin/classes/helper/DbQuery.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/AddData.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/CycleUseage$cycleAdapter.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/CycleUseage.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/CycleUseageRedesign.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/DeleteData$TabListener.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/DeleteData.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/EditChooseLists.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/EditCycle.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/EditData$TabListener.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/EditData.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/EditPurchase.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/HarvestDetails.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/HireLabour.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/MainMenu$click.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/MainMenu.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/ManageData.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/NewCycleRedesigned$TouchL.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/NewCycleRedesigned.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/NewPurchaseRedesign$TouchL.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/NewPurchaseRedesign.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/R$id.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/R$layout.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/R$menu.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/R$string.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/R$style.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/R$styleable.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/SalesCost.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/UseResource$TouchL.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/UseResource.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/ViewCycleUsege$CycUseAdpt.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/ViewCycleUsege.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/ViewNavigation$TabListener.class
	AgriExpenseTT/bin/classes/uwi/dcit/agriexpensett/ViewNavigation.class
	AgriExpenseTT/bin/dexedLibs/appcompat_v7_2-05f9ff7f70ee2e871f185ca01265c05a.jar
	AgriExpenseTT/bin/proguard.txt
	AgriExpenseTT/bin/resources.ap_
	AgriExpenseTT/gen/.gitignore
	AgriExpenseTT/src/fragments/FragmentPurchaseUse.java
	appcompat_v7_2/bin/appcompat_v7_2.jar