Merge branch 'renchunyu'

Conflicts:
KIMREE/MainViewController.m
KIMREE/en.lproj/MainViewController.xib