Fixed retina/contentScale position errors for iPhone 6+ devices in EditBox.

Problem is that factor was 1.0 or 2.0 until iOS 8 introduced 3.0.
Merge pull request #1 from cocos2d/v3

Update from cocos2d-x
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Remove useless copy about luasocket on the android platform
ListViewReader completed and listview callback feature.
Merge branch 'v3' into fixEditBox_v3
fix EditBox move animation position is wrong on iPhone6 Plus
1. ListView demo compeleted.
2. Optimized ListViewReader format.
Update CCActionTimelineCache.cpp, LayoutReader.cpp, PageViewReader.cpp, ScrollViewReader.cpp, TextFieldReader.cpp, TextReader.cpp
Merge pull request #9431 from pipu/update_widget_reader_and_actiontimeline_reader

Update some widget reader and action time line reader
Merge pull request #9385 from samuele3hu/v3_cocostudio

Remove useless copy about luasocket on the android platform
Add Websocket support for Mac platform
[AUTO]: updating luabinding automatically
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
listview resources added
add TextureResType to LoadingBar
Merge pull request #9402 from doomsdayer/v3_listview

V3 listview
Merge pull request #9434 from CocosRobot/update_lua_bindings_1418121129

[AUTO]: updating luabinding automatically