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 branch 'v3' into fixEditBox_v3
fix EditBox move animation position is wrong on iPhone6 Plus
Add Websocket support for Mac platform
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.
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.
replace tab with 4 spaces
Merge pull request #9410 from andyque/fixEditBox_v3

Fix edit box v3
[ci skip] Update CHANGELOG
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio
Merge pull request #9449 from Dhilan007/v3-keycode

Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.
Merge pull request #9441 from pipu/update_reader

Update Reader
update v3-deps to 29
Merge pull request #9452 from minggo/java-style

[ci skip]use java coding style
Merge pull request #9454 from andyque/modifyExternal

update v3-deps to 29
1. Fixes #4957 that click test TestChangePlaySection, then it will crash.
2. Modify default value of selectedState to serialize check box data.