Progress bar in the works
just commit
Merge branch 'guster' of 192.168.0.3:tan-chong/sa into guster

Conflicts:
	.idea/workspace.xml
	out/production/Nissan/Nissan.apk
	out/production/Nissan/Nissan.unaligned.apk
	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$2.class
	out/production/Nissan/com/guster/nissan/activity/MainActivity.class
	out/production/Nissan/com/guster/nissan/activity/VehicleSummaryActivity.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/ngy/nissan/activity/EditContactActivity.class
	out/production/Nissan/com/ngy/nissan/fragment/ContactFragment.class
	out/production/Nissan/com/ngy/nissan/list/ContactListAdapter.class
	src/com/guster/nissan/activity/StockInfoActivity.java
	src/com/guster/nissan/receiver/WifiStateReceiver.java
StockDisplay work in progress
Stock Display checkpoint
Stock Display finished.
Merge branch 'guster' of 192.168.0.3:tan-chong/sa into guster

Conflicts:
	src/com/guster/nissan/fragment/StockListFragment.java