Initial Commit
Messy Incomplete Stock Display Commit
Expendable List Prototype
Guster pull commit
Merge branch 'overlay' into guster

Conflicts:
	AndroidManifest.xml
	Nissan.iml
	out/production/Nissan/Nissan.afp.apk
	out/production/Nissan/Nissan.apk
	out/production/Nissan/Nissan.apk.res
	out/production/Nissan/Nissan.unaligned.apk
	out/production/Nissan/classes.dex
	out/production/Nissan/com/actionbarsherlock/R$id.class
	out/production/Nissan/com/actionbarsherlock/R$integer.class
	out/production/Nissan/com/actionbarsherlock/R$layout.class
	out/production/Nissan/com/actionbarsherlock/R$menu.class
	out/production/Nissan/com/actionbarsherlock/R$string.class
	out/production/Nissan/com/actionbarsherlock/R$style.class
	out/production/Nissan/com/actionbarsherlock/R$styleable.class
	out/production/Nissan/com/astuetz/viewpager/extensions/R$id.class
	out/production/Nissan/com/astuetz/viewpager/extensions/R$integer.class
	out/production/Nissan/com/astuetz/viewpager/extensions/R$layout.class
	out/production/Nissan/com/astuetz/viewpager/extensions/R$menu.class
	out/production/Nissan/com/astuetz/viewpager/extensions/R$string.class
	out/production/Nissan/com/astuetz/viewpager/extensions/R$style.class
	out/production/Nissan/com/astuetz/viewpager/extensions/R$styleable.class
	out/production/Nissan/com/guster/nissan/MyApplication.class
	out/production/Nissan/com/guster/nissan/R$id.class
	out/production/Nissan/com/guster/nissan/R$integer.class
	out/production/Nissan/com/guster/nissan/R$layout.class
	out/production/Nissan/com/guster/nissan/R$menu.class
	out/production/Nissan/com/guster/nissan/R$string.class
	out/production/Nissan/com/guster/nissan/R$style.class
	out/production/Nissan/com/guster/nissan/R$styleable.class
	out/production/Nissan/com/guster/nissan/activity/MainActivity$1$1.class
	out/production/Nissan/com/guster/nissan/activity/MainActivity$1.class
	out/production/Nissan/com/guster/nissan/activity/MainActivity$2.class
	out/production/Nissan/com/guster/nissan/activity/MainActivity.class
	out/production/Nissan/com/guster/nissan/activity/SplashActivity.class
	out/production/Nissan/com/guster/nissan/activity/VehicleDetailsActivity.class
	out/production/Nissan/com/guster/nissan/activity/VehicleSummaryActivity.class
	out/production/Nissan/com/guster/nissan/fragment/LoadingFragment.class
	out/production/Nissan/com/guster/nissan/fragment/MainFragment.class
	out/production/Nissan/com/guster/nissan/fragment/PresentationFragment.class
	out/production/Nissan/com/guster/nissan/fragment/VehicleDetailsFragment.class
	out/production/Nissan/com/guster/nissan/fragment/VehicleDetailsItemFragment$1.class
	out/production/Nissan/com/guster/nissan/fragment/VehicleDetailsItemFragment.class
	out/production/Nissan/com/guster/nissan/fragment/VehicleListFragment.class
	out/production/Nissan/com/guster/nissan/fragment/VehicleSummaryFragment$1.class
	out/production/Nissan/com/guster/nissan/fragment/VehicleSummaryFragment.class
	out/production/Nissan/com/guster/nissan/list/SlidingMenuListAdapter.class
	out/production/Nissan/com/guster/nissan/list/VehicleListAdapter.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$id.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$integer.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$layout.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$menu.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$string.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$style.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$styleable.class
	out/production/Nissan/com/ngy/nissan/activity/EditContactActivity.class
	out/production/Nissan/com/ngy/nissan/fragment/ContactFragment$1.class
	out/production/Nissan/com/ngy/nissan/fragment/ContactFragment$2.class
	out/production/Nissan/com/ngy/nissan/fragment/ContactFragment$3.class
	out/production/Nissan/com/ngy/nissan/fragment/ContactFragment$4.class
	out/production/Nissan/com/ngy/nissan/fragment/ContactFragment$5.class
	out/production/Nissan/com/ngy/nissan/fragment/ContactFragment.class
	out/production/Nissan/com/ngy/nissan/list/ContactListAdapter.class
webservice conflicts commit
updated commit
cherry pick
JSON stored into database commit (model)
Working on array commit (stock info)
StockInfo (displays values from the database)
StockInfo loads data from the database commit
removed .DS_Store files
Merge branch 'guster' of 192.168.0.3:tan-chong/sa into guster

Conflicts:
	out/production/Nissan/Nissan.apk
	out/production/Nissan/Nissan.unaligned.apk
	out/production/Nissan/classes.dex
	out/production/Nissan/com/actionbarsherlock/R$attr.class
	out/production/Nissan/com/actionbarsherlock/R$bool.class
	out/production/Nissan/com/actionbarsherlock/R$color.class
	out/production/Nissan/com/actionbarsherlock/R$dimen.class
	out/production/Nissan/com/actionbarsherlock/R$drawable.class
	out/production/Nissan/com/actionbarsherlock/R$id.class
	out/production/Nissan/com/actionbarsherlock/R$integer.class
	out/production/Nissan/com/actionbarsherlock/R$layout.class
	out/production/Nissan/com/actionbarsherlock/R$string.class
	out/production/Nissan/com/actionbarsherlock/R$style.class
	out/production/Nissan/com/actionbarsherlock/R$styleable.class
	out/production/Nissan/com/actionbarsherlock/R.class
	out/production/Nissan/com/astuetz/viewpager/extensions/R$attr.class
	out/production/Nissan/com/astuetz/viewpager/extensions/R$bool.class
	out/production/Nissan/com/astuetz/viewpager/extensions/R$color.class
	out/production/Nissan/com/astuetz/viewpager/extensions/R$dimen.class
	out/production/Nissan/com/astuetz/viewpager/extensions/R$drawable.class
	out/production/Nissan/com/astuetz/viewpager/extensions/R$styleable.class
	out/production/Nissan/com/astuetz/viewpager/extensions/R.class
	out/production/Nissan/com/guster/nissan/DataContentProvider.class
	out/production/Nissan/com/guster/nissan/MyApplication.class
	out/production/Nissan/com/guster/nissan/R$attr.class
	out/production/Nissan/com/guster/nissan/R$bool.class
	out/production/Nissan/com/guster/nissan/R$color.class
	out/production/Nissan/com/guster/nissan/R$dimen.class
	out/production/Nissan/com/guster/nissan/R$drawable.class
	out/production/Nissan/com/guster/nissan/R$id.class
	out/production/Nissan/com/guster/nissan/R$integer.class
	out/production/Nissan/com/guster/nissan/R$layout.class
	out/production/Nissan/com/guster/nissan/R$menu.class
	out/production/Nissan/com/guster/nissan/R$string.class
	out/production/Nissan/com/guster/nissan/R$style.class
	out/production/Nissan/com/guster/nissan/R$styleable.class
	out/production/Nissan/com/guster/nissan/R.class
	out/production/Nissan/com/guster/nissan/activity/MainActivity$1$1.class
	out/production/Nissan/com/guster/nissan/activity/MainActivity$1.class
	out/production/Nissan/com/guster/nissan/activity/MainActivity$2.class
	out/production/Nissan/com/guster/nissan/activity/MainActivity.class
	out/production/Nissan/com/guster/nissan/activity/SplashActivity.class
	out/production/Nissan/com/guster/nissan/activity/VehicleDetailsActivity.class
	out/production/Nissan/com/guster/nissan/activity/VehicleSummaryActivity.class
	out/production/Nissan/com/guster/nissan/fragment/LoadingFragment.class
	out/production/Nissan/com/guster/nissan/fragment/MainFragment.class
	out/production/Nissan/com/guster/nissan/fragment/PresentationFragment.class
	out/production/Nissan/com/guster/nissan/fragment/VehicleDetailsFragment.class
	out/production/Nissan/com/guster/nissan/fragment/VehicleDetailsItemFragment$1.class
	out/production/Nissan/com/guster/nissan/fragment/VehicleDetailsItemFragment.class
	out/production/Nissan/com/guster/nissan/fragment/VehicleListFragment.class
	out/production/Nissan/com/guster/nissan/fragment/VehicleSummaryFragment$1.class
	out/production/Nissan/com/guster/nissan/fragment/VehicleSummaryFragment.class
	out/production/Nissan/com/guster/nissan/list/SlidingMenuListAdapter.class
	out/production/Nissan/com/guster/nissan/list/VehicleListAdapter.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$attr.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$bool.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$color.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$dimen.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$drawable.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$id.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$integer.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$layout.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$string.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$style.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R$styleable.class
	out/production/Nissan/com/jeremyfeinstein/slidingmenu/lib/R.class
	out/production/Nissan/com/ngy/nissan/activity/EditContactActivity.class
	out/production/Nissan/com/ngy/nissan/fragment/ContactFragment.class
	out/production/Nissan/com/ngy/nissan/list/ContactListAdapter.class
	res/drawable/btn_background.xml
	res/layout/fragment_main.xml
	src/com/guster/nissan/DataContentProvider.java
	src/com/guster/nissan/activity/FeedbackActivity.java
	src/com/guster/nissan/activity/StockInfoActivity.java
	src/com/guster/nissan/db/StockDB.java
	src/com/guster/nissan/fragment/MainFragment.java
	src/com/guster/nissan/fragment/StockListFragment.java
	src/com/guster/nissan/util/WebService.java
Transaction filter/sort functions