testing
room 1.27
room 1.28
Merge branch 'server1.27'

Conflicts:
	proj.ios/.DS_Store
	proj.ios/TestCocos2dx.xcodeproj/project.xcworkspace/xcuserdata/othink.xcuserdatad/UserInterfaceState.xcuserstate
room 1.28