merge
Updates to latest cocos2d-x version
Moved global variables as ivars
moved 3d stuff to game code

it is easier to upgrade cocos2d now
added new 3d models
remove openGL error
Merge branch 'master' of https://github.com/Wu-Hao/Moon3D
Merge pull request #9 from ricardoquesada/updates_cocos2d

Updates cocos2d
rotation
first merge
Bullet controller, temporarily removed sprite culling
merged
merge new
Merge pull request #10 from yuye-liu/master

merge aircraft rotation
basic collision
Merge branch 'master' of https://github.com/Wu-Hao/Moon3D

Conflicts:
	Classes/Fodder.cpp
	Classes/GameLayer.cpp
	Classes/GameLayer.h
remove openGL error call
add support for parameter outline width, outline colour
change demo to test outline colour and outline width
Merge branch 'master' into outline_improvement

* master:
  basic collision
  merged
  Bullet controller, temporarily removed sprite culling
  rotation
  moved 3d stuff to game code
  Moved global variables as ivars
  Updates to latest cocos2d-x version
  merge

Conflicts:
	Classes/3d/Sprite3D.cpp
	Classes/3d/Textured.es2.vert.h
	Classes/Player.cpp