FIx: correct TotalTime of ActionObject.
Fix compilation error using arch i386

Adding a member variable to hold the `placeholderAttributes` property fixes a compilation error regarding synthesis when building with ARCH=i386.
modify /merge to /head in pull-request-build.
closed #5188, fixed android NULL pointer exception
Merge pull request #18 from andyque/xxx

issue #323, hehe
fix compile error and synchronizate the UI change for Lua
Merge pull request #6615 from xhcnb/fix_ActionObject

FIx: correct TotalTime of ActionObject.
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
[ci skip]
[ci skip]
Merge pull request #6758 from samuele3hu/v3_fix

fix compile error and synchronizate the UI change for Lua
[AUTO]: updating luabinding automatically
Merge pull request #6759 from CocosRobot/update_lua_bindings_1400141832

[AUTO]: updating luabinding automatically
[ci skip], modify build-job termination time.
Update some GuiConstants and resubmission  pr#6361.
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
modify build terminal time in watchdog.py.[ci skip]
Merge pull request #6760 from shujunqiao/watchdog

[ci skip], modify build-job termination time.
Merge pull request #6761 from samuele3hu/v3_fix

Update some GuiConstants and resubmission pr#6361.
Merge pull request #6764 from minggo/monkey-test

EditBox: Check text content before being sent to cpp