Merge branch 'renchunyu' into gouwenqi

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