10/8
Merge branch 'master' of https://github.com/sdkteam/VinaphoneSaleNew

Conflicts:
	VinaphoneSale.xcodeproj/project.pbxproj
	VinaphoneSale/Constant.h
	VinaphoneSale/Storyboard_Iphone35.storyboard