[FIX]: When getting the string value, check which textfield is in use
[FIX]: when setting the string value, change both textfields.
merge iOS arm64 lib to fat lib, change the project setting.
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into merge_arm64_lib_to_fat_lib
Issue #5724: Correction of property name in CCBone
Fixed #5724: Use correct transform in CCSkin's updateTransform function
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into ArmatureTrans
[AUTO][ci skip]: updating cocos2dx_files.json
fix lua compile error in xcode6 beta3
fix error.
Merge pull request #7442 from pandamicro/ArmatureTrans

Fixed #5724: Fix armature bone's transform issue
Merge pull request #7445 from CocosRobot/update_cocosfiles_1405403210

[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #7446 from natural-law/v3

Update the reference of submodule cocos2d-console.
update release note
Update RELEASE_NOTES.md
Update RELEASE_NOTES.md
Merge pull request #7447 from minggo/update-release-note

Update release note
fix Layout typo
Merge pull request #7448 from andyque/fixTypo

fix Layout typo
Merge pull request #7426 from Mazyod/cceditbox-mac-fix

CCEditBox SecureInput Mac Fixes
[ci skip]