no message
Merge branch 'master' of https://github.com/tangbinqi/BeautifulStart

Conflicts:
	BeautifulStart/Views+Controllers/UserCenter/en.lproj/BSUserCenterViewController.xib