Merge branch 'renchunyu'

Conflicts:
KIMREE.xcodeproj/project.pbxproj
KIMREE/MainViewController.m
KIMREE/en.lproj/MainViewController.xib