test 1
latestCommit
Merge branch 'master' of https://github.com/iweseri/jzmvu into iweseri-master

Conflicts:
	BottomSwipeView.m
	myjam.xcodeproj/project.pbxproj
	myjam/AppDelegate.mm
	myjam/Shop/CustomCell/ProductTableViewCell.xib
	myjam/Shop/ProductHeaderView.xib
	myjam/Shop/PurchasedHeaderView.xib
	myjam/Shop/ShopAddressViewController.xib
Iwe #20130319
project file
Merge branch 'iweseri-master'