closed #3273: ScriptingCore::evalString crashes
fix box2d compile error in ndk
Merge pull request #4372 from dumganhar/iss3273-evalString-crash

closed #3273: ScriptingCore::evalString crashes
- Reverted modification. See below.

> @@ -301,7 +301,8 @@ void UIListView::removeLastItem()
>
>  UIWidget* UIListView::getItem(unsigned int index)
>  {
> -    if ((int)index < 0 || index >= _items->count())
> +    // @todo Signed/unsigned mishmash. Index is must be unsigned int always. Yes?
> +    if ( ((int)index < 0) || ((int)index >= _items->count()) )

May be we should change the type of parameter.
So could you please revert the modification of this file?
Merge pull request #4358 from samuele3hu/developTableView

issue #3228:CallFuncND + auto remove lua test case have no effect
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
issue #2771:  refactor PhysicsWorld and PhysicsWorldInfo
FontTest was not rendering TTFs
Merge branch 'develop' into newRenderer
Merge branch 'develop' into constructors_are_protected

Conflicts:
	cocos/2d/CCActionInstant.h
JS Bindings Menu

doesn't initialize the menu twice.
Sprite now using New renderer
Merge pull request #4373 from lajos/dev_macfonttest

closed #3275: Adding FontTest for Mac
Update AUTHORS [ci skip]
closed #3274: Can't override cc.Node.setPosition in JSB.
Merge pull request #4374 from dumganhar/iss3274-js-override

closed #3274: [JSB] Can't override cc.Node.setPosition in JSB. Removes JSPROP_READONLY and adds JSPROP_ENUMERATE for some methods
Merge commit 'refs/pull/4351/head' of git://github.com/cocos2d/cocos2d-x into constructors_are_protected
Merge pull request #4361 from Dhilan007/eclipse_build_fix

[ci skip]Remove something association of CDT Builder,it make 'miss error' in buil...
issue #2771: refactor some functions and delete PHYSICS_INFINITY macro.
add proceed java compilation and generate apk.