Merge branch 'gouwenqi' of https://github.com/KIMREE/KIMREE into gouwenqi

Conflicts:
	KIMREE.xcodeproj/project.pbxproj
	KIMREE/ProductViewController.m