17/10/13 1:03pm
17/10/13 1:17PM
18/10/13 2:30PM
3:30pm
b2 merged into master
B1 merged into master by single file approach

21/10/12 3:32 PM
21/10/13 5:24 PM
	
Merge remote-tracking branch 'origin/master' into B1

Conflicts:
	.classpath
	bin/Reta-x.apk
	bin/classes.dex
	bin/classes/zigtraka/nfc/reta_x/Chartsandgraphs.class
	bin/classes/zigtraka/nfc/reta_x/KpiForAssets.class
	bin/classes/zigtraka/nfc/reta_x/KpiForCustomers.class
	bin/classes/zigtraka/nfc/reta_x/ListAdapter.class
	bin/classes/zigtraka/nfc/reta_x/Login$1.class
	bin/classes/zigtraka/nfc/reta_x/Login$2.class
	bin/classes/zigtraka/nfc/reta_x/Login.class
	bin/classes/zigtraka/nfc/reta_x/Misc.class
	bin/classes/zigtraka/nfc/reta_x/NFCInteractionAdapter.class
	bin/classes/zigtraka/nfc/reta_x/NFCSettingsAdapter.class
	bin/classes/zigtraka/nfc/reta_x/ProductInformation.class
	bin/classes/zigtraka/nfc/reta_x/R$id.class
	bin/classes/zigtraka/nfc/reta_x/R$layout.class
	bin/classes/zigtraka/nfc/reta_x/R$menu.class
	bin/classes/zigtraka/nfc/reta_x/R$string.class
	bin/classes/zigtraka/nfc/reta_x/R$style.class
	bin/classes/zigtraka/nfc/reta_x/R$xml.class
	bin/classes/zigtraka/nfc/reta_x/SearchProduct.class
	bin/classes/zigtraka/nfc/reta_x/StockTake.class
	bin/resources.ap_
	gen/zigtraka/nfc/reta_x/R.java
	res/drawable-hdpi/buttons.xml
	res/layout/chartsandgraphs.xml
	src/zigtraka/nfc/reta_x/Login.java