no message
Merge branch 'master' of https://github.com/wantnon2/c3dEngine2

Conflicts:
	c3dEngine2/c3dEngine/core/c3dGestureAnalyzer.cpp
	c3dEngine2/c3dEngine/core/c3dGestureAnalyzer.h
	c3dEngine2/c3dEngine/core/c3dIndexVBO.h
	c3dEngine2/c3dEngine/core/c3dInitGame.cpp
	c3dEngine2/c3dEngine/core/c3dMesh.cpp
	c3dEngine2/c3dEngine/core/c3dMesh.h
	c3dEngine2/c3dEngine/core/c3dNode.h
	c3dEngine2/c3dEngine/core/c3dProgramCache.h
	c3dEngine2/c3dEngine/platform/iOS/appFrame/c3dView.mm
	c3dEngine2/c3dEngine/platform/iOS/appFrame/c3dViewController.mm
	c3dEngine2/c3dEngine/platform/iOS/c3dALPlatformDepend.mm
	c3dEngine2/c3dEngine/platform/win32/appFrame/mainWindowFuncs.cpp
	c3dEngine2/demos/box/proj.ios/c3d.xcodeproj/project.pbxproj
	c3dEngine2/demos/box/proj.ios/c3d.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
	c3dEngine2/demos/bulletTest1/proj.ios/c3d.xcodeproj/project.pbxproj
	c3dEngine2/demos/bulletTest1/proj.ios/c3d.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
	c3dEngine2/demos/bulletTest1/projcode/layer.h
	c3dEngine2/demos/importMyOwnFormat/proj.ios/c3d.xcodeproj/project.pbxproj
	c3dEngine2/demos/importMyOwnFormat/proj.ios/c3d.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
	c3dEngine2/demos/terrain/proj.ios/c3d.xcodeproj/project.pbxproj
	c3dEngine2/demos/terrain/proj.ios/c3d.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
	c3dEngine2/demos/terrain/proj.ios/c3d.xcodeproj/project.xcworkspace/xcuserdata/ck02-084.xcuserdatad/UserInterfaceState.xcuserstate
	c3dEngine2/extension/octree/octree.cpp
	c3dEngine2/extension/octree/octree.h
	c3dEngine2/thirdPart/bullet/bullet-2.82-r2704/lib/libBulletCollision_xcode4.a
	c3dEngine2/thirdPart/bullet/bullet-2.82-r2704/lib/libBulletDynamics_xcode4.a
	c3dEngine2/thirdPart/bullet/bullet-2.82-r2704/lib/libLinearMath_xcode4.a