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
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.
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
Merge pull request #9402 from doomsdayer/v3_listview

V3 listview
Merge pull request #9434 from CocosRobot/update_lua_bindings_1418121129

[AUTO]: updating luabinding automatically
Update Reader
Update that sets default value of font name for ButtonReader, TextFieldReader, TextReader
1. Fix bug that after load .csb file, call Text widget's setString(), content of string dosen't line wrap and content of Text is chaotic.
2. Update how to parse attribute scale9Enabled
use java coding style
Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.