Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3716_refactor_physicscontact
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	samples/Javascript/Shared
removed submodule “sample/javascript/Shared”;
Add `else` to `if`
code follows c++ guidelines
Adds the possibility to create EAGLView with an EAGLView
EGLView is not longer a singleton
Renames EGLView -> GLView
Renames EGLView -> GLView
Linux with #ifdef
Fixes compilation issues on Android and Linux
TestCpp: compiles on linux
new config file
Merge pull request #5271 from ricardoquesada/glview_improvements

GlView improvements
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #5272 from CocosRobot/updategeneratedsubmodule_1391139446

[AUTO] : updating submodule reference to latest autogenerated bindings
glview uses rect instead of size

this is because it could be needed if you want to create a view
inside a window in an specific position
Merge pull request #5273 from ricardoquesada/glview_with_rect

glview uses rect instead of size
oops, compiles on linux
Merge pull request #5274 from ricardoquesada/linux_glview_fixes

oops, compiles on linux