ljm
Merge branch 'master' of https://github.com/ourteamLemon/Rencuo

Conflicts:
Rencuo/AppDelegate/AppDelegate.m
Merge branch 'master' of https://github.com/ourteamLemon/Rencuo

Conflicts:
	Rencuo/AppDelegate/AppDelegate.m
ljm