closed #4552: separate material ID and openGL ProgramID
closed #4552: change assert log message
Merge pull request #6016 from samuele3hu/develop_test

Modify lua project setting and replace NativeActivity with Cocos2dActivity
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
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test