did a bunch of things. i hope location works on your emulator now
nothing
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/CameraFragment$1.class
	shoppit/bin/classes/il/ac/huji/shoppit/CameraFragment$2$1.class
	shoppit/bin/classes/il/ac/huji/shoppit/CameraFragment$2$2.class
	shoppit/bin/classes/il/ac/huji/shoppit/CameraFragment$2.class
	shoppit/bin/classes/il/ac/huji/shoppit/CameraFragment$3.class
	shoppit/bin/classes/il/ac/huji/shoppit/CameraFragment$4.class
	shoppit/bin/classes/il/ac/huji/shoppit/CameraFragment.class
	shoppit/bin/classes/il/ac/huji/shoppit/CategoryFragment$1.class
	shoppit/bin/classes/il/ac/huji/shoppit/CategoryFragment.class
	shoppit/bin/classes/il/ac/huji/shoppit/CommentDialogFragment.class
	shoppit/bin/classes/il/ac/huji/shoppit/ItemActivity.class
	shoppit/bin/classes/il/ac/huji/shoppit/ItemAdapter.class
	shoppit/bin/classes/il/ac/huji/shoppit/MainActivity.class
	shoppit/bin/classes/il/ac/huji/shoppit/MapActivity.class
	shoppit/bin/classes/il/ac/huji/shoppit/NavDrawerAdapter.class
	shoppit/bin/classes/il/ac/huji/shoppit/NewItemFragment.class
	shoppit/bin/classes/il/ac/huji/shoppit/NewShopFragment.class
	shoppit/bin/classes/il/ac/huji/shoppit/R$id.class
	shoppit/bin/classes/il/ac/huji/shoppit/R$string.class
	shoppit/bin/classes/il/ac/huji/shoppit/R$styleable.class
	shoppit/bin/classes/il/ac/huji/shoppit/ShopActivity.class
	shoppit/bin/classes/il/ac/huji/shoppit/ShopAdapter.class
	shoppit/bin/classes/il/ac/huji/shoppit/ShopListFragment.class
	shoppit/bin/classes/il/ac/huji/shoppit/SplashFragment.class
	shoppit/bin/resources.ap_
	shoppit/gen/il/ac/huji/shoppit/R.java
	shoppit/src/il/ac/huji/shoppit/CameraFragment.java