lee 7/8 6.52
lee

Conflicts:
	xiaoqu/AppDelegate.m
	xiaoqu/LoginViewController.m