network
Merge branch 'master' of https://github.com/fuxiaoghost/ElongFramework

Conflicts:
	ElongFramework/ElongFramework.xcodeproj/project.pbxproj