Modify action
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
update submodule
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
Fixed bug of setting anchor point
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
Format codes
closed #4315: fixed clippingNode alphaTest Bug
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
[Jenkins] fix the crash in comment trigger
Merge pull request #5649 from dabingnn/develop_fix_clippingNodeShaderBug

closed #4315: fixed clippingNode alphaTest Bug
Merge pull request #5643 from nutty898/develop_nutty_modify_framework_for315CrashFixed

Develop nutty modify framework for315 crash fixed
closed #4324: fix double free bug. move _preContactData to PhysicsContact class, add PhysicsContact::getPreContactData() method.
Merge pull request #5662 from boyu0/bug4324_physicscontact_memory_leak

closed #4324: fix double free bug. move _preContactData to PhysicsContact class, add PhysicsContact::getPreContactData() method.
[AUTO]: updating luabinding automatically
Update CHANGELOG [ci skip]
Merge pull request #5664 from CocosRobot/update_lua_bindings_1394506283

[AUTO]: updating luabinding automatically
Merge pull request #5651 from lmskater/fix-comment-trigger

[Jenkins] fix the crash in comment trigger
fix the lua template
Merge branch 'develop' of https://github.com/lihex/cocos2d-x into develop