fix touches not working in cocosbuilder
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio
Merge pull request #4341 from Dhilan007/touchfix

fix touches not working in cocosbuilder
resolve conflict
add miss api
Merge pull request #4344 from dumganhar/develop

Fixing warning generated by VS2012.
Merge pull request #4340 from Dhilan007/jssubmodule

recover controller on layer.
Don't deprecate callback functions in Layer. Reason:
Callback function should not be deprecated, it will generate lots of warnings.
Since 'setTouchEnabled' was deprecated, it will make warnings if developer overrides onTouchXXX and invokes setTouchEnabled(true) instead of using EventDispatcher::addEventListenerWithXXX.
Fix of unsigned / signed mismatch in UIPageView.cpp.
Removing unused 'virtual' keyword in testcpp since we're using EventDispatcher::addEventListenerXXX to register event listener.