Stamps done
Merge branch 'develop' of github.com:flypay/gbk_iOS into develop

Conflicts:
	gbk/GBK.xcodeproj/project.pbxproj
	gbk/gbk/Source/GBKRewardDetailsViewController.m
	gbk/gbk/Source/GBKStampsViewController.m