22/05/2014:

VoucherNearbyActivity.java
VoucherPremiumFragment.java
VoucherDetailsActivity.java
MainDrawerActivity.java
+ VshakeFragment.java
+ VshakeMerchantListActivity.java
+ MerchantVshakeObject.java
+ VshakeObject.java
+ FBCheckInObject.java
+ ExpandableListAdapterMerchantVshake.java

list_nearby_item.xml	
list_voucher_premium_item.xml
map_infowindow.xml
actionbar_mainvoucher.xml
strings.xml
AndroidManifest.xml
+ fragment_vshake.xml
+ activity_vshake_merchant_list.xml
+ list_vshakemerchant_group.xml
+ list_vshakemerchant_item.xml

+ tag_hot.png
+ tag_premium.png
+ default_voucher.jpg
+ vshake_background.png
+ vshake_logo_green.png
+ merchantvshake_header_background.png
+ start_vshake_button.png
Merge branch 'master' of https://github.com/vgrab/Vgrab.git

Conflicts:
	Vgrab/res/values/strings.xml
22/05/2014 - Merged