we're using NewItemActivity now (not AddItemActivity). NewItemActivity uploads correctly. (has a few TODOs in it)
added custom app icons. (you can change this…)
icons...
Merge branch 'master' of https://github.com/kgnvch/Shoppit

Conflicts:
	shoppit/bin/R.txt
	shoppit/bin/Shoppit.apk
	shoppit/bin/classes.dex
	shoppit/bin/classes/il/ac/huji/shoppit/AddItemActivity$1$1.class
	shoppit/bin/classes/il/ac/huji/shoppit/AddItemActivity$1.class

shoppit/bin/classes/il/ac/huji/shoppit/AddItemActivity$Categ1Selection.c
lass
	shoppit/bin/classes/il/ac/huji/shoppit/AddItemActivity.class
	shoppit/bin/classes/il/ac/huji/shoppit/CameraFragment.class
	shoppit/bin/classes/il/ac/huji/shoppit/InfoActivity.class
	shoppit/bin/classes/il/ac/huji/shoppit/LoginActivity.class
	shoppit/bin/classes/il/ac/huji/shoppit/MainActivity.class
	shoppit/bin/classes/il/ac/huji/shoppit/NewItemActivity.class
	shoppit/bin/classes/il/ac/huji/shoppit/NewItemFragment.class
	shoppit/bin/classes/il/ac/huji/shoppit/R$id.class
	shoppit/bin/classes/il/ac/huji/shoppit/R$integer.class
	shoppit/bin/classes/il/ac/huji/shoppit/R$layout.class
	shoppit/bin/classes/il/ac/huji/shoppit/R$menu.class
	shoppit/bin/classes/il/ac/huji/shoppit/R$string.class
	shoppit/bin/classes/il/ac/huji/shoppit/R$style.class
	shoppit/bin/classes/il/ac/huji/shoppit/R$styleable.class
	shoppit/bin/classes/il/ac/huji/shoppit/R$xml.class
	shoppit/bin/resources.ap_
	shoppit/gen/il/ac/huji/shoppit/R.java
	shoppit/src/il/ac/huji/shoppit/AddItemActivity.java