Revert "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/com/facebook/android/R$drawable.class
	shoppit/bin/classes/il/ac/huji/shoppit/GeneralInfo.class
	shoppit/bin/classes/il/ac/huji/shoppit/R$drawable.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/com/facebook/android/R.java
	shoppit/gen/il/ac/huji/shoppit/R.java
	shoppit/src/il/ac/huji/shoppit/GeneralInfo.java