added currency field and changed price to a double

(will this clash with the current parse db we have?)
added Shop.java and ShopActivity. (no way to reach shop activity atm)
Merge branch 'master' of https://github.com/kgnvch/Shoppit

Conflicts:
	shoppit/bin/Shoppit.apk
	shoppit/bin/classes.dex

shoppit/bin/classes/il/ac/huji/shoppit/MainActivity$CategoryFragment$1.c
lass

shoppit/bin/classes/il/ac/huji/shoppit/MainActivity$CategoryFragment.cla
ss

shoppit/bin/classes/il/ac/huji/shoppit/MainActivity$DrawerItemClickListe
ner.class
	shoppit/bin/classes/il/ac/huji/shoppit/MainActivity.class
	shoppit/bin/dexedLibs/Parse-1.3.3-5e4a059aa5a7cd75ee848f1c01a433b7.jar

shoppit/bin/dexedLibs/android-support-v4-e4760fd9f2c697ebf9ace777f4f97cd
e.jar

shoppit/bin/dexedLibs/android-support-v7-appcompat-081e3192d921b4b0013d5
f5a85ab00a0.jar

shoppit/bin/dexedLibs/android-support-v7-appcompat-eeaaee8f7d69b4818d404
1c525d68a7b.jar

shoppit/bin/dexedLibs/google-play-services-28eb1621f1bb0e58d661a3af24891
13e.jar

shoppit/bin/dexedLibs/google-play-services_lib-691c24f9fd599d00fcab49a9a
1e9c207.jar
	shoppit/bin/jarlist.cache
	shoppit/bin/resources.ap_