Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2723_defineGetterSetter

Author: dingpinglv

extensions/cocostudio/loader/parsers/timelineParser-2.x.js

@@ -1250,6 +1250,7 @@
 
     var register = [
         {name: "SingleNodeObjectData", handle: parser.initSingleNode},
+        {name: "NodeObjectData", handle: parser.initSingleNode},
         {name: "LayerObjectData", handle: parser.initSingleNode},
         {name: "SpriteObjectData", handle: parser.initSprite},
         {name: "ParticleObjectData", handle: parser.initParticle},