closed #4552: separate material ID and openGL ProgramID
closed #4552: change assert log message
Merge pull request #5977 from dabingnn/develop_fixID_Android_bug

Develop fix id android bug
[AUTO]: updating luabinding automatically
Merge pull request #6017 from CocosRobot/update_lua_bindings_1395899624

[AUTO]: updating luabinding automatically
Update coco2dx.ini for binding `ProtectedNode` class
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test
Add lua binding for `getOpenGLView` of `Director`
closed #102, add CC_CONSTRUCTOR_ACCESS to CCProtectedNode
Merge pull request #6021 from andyque/fix_temp

closed #102, add CC_CONSTRUCTOR_ACCESS to CCProtectedNode
[Jenkins] Make build as failed when generating bindings fails
Merge pull request #6022 from Dhilan007/develop_label4565

closed #4565:fixed logical error in Label::setFontAtlas.
Merge pull request #6023 from lmskater/fix-generator-bindings-fail

[Jenkins] Make build as failed when generating bindings fails
Merge pull request #6020 from samuele3hu/develop_test

Update the cocos2dx.ini for lua binding
[AUTO]: updating luabinding automatically
Merge pull request #6024 from CocosRobot/update_lua_bindings_1395903260

[AUTO]: updating luabinding automatically
closed #4569:Texture2D support for update partial texture