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

Conflicts:
.DS_Store
lys
Merge branch 'master' of https://github.com/ourteamLemon/Rencuo

Conflicts:
	.DS_Store
	Rencuo.xcodeproj/project.pbxproj

Rencuo.xcworkspace/xcuserdata/lian.xcuserdatad/UserInterfaceState.xcuser
state

Rencuo.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcusers
tate
	Rencuo/AppDelegate/CommonDefines.h