server Request
Merge branch 'master' of https://github.com/coreMember/studyNewTechnique

Conflicts:
	se/MyGame/proj.ios_mac/MyGame.xcodeproj/project.pbxproj