Merge pull request cocos2d#3207 from VisualSJ/develop_12_11

support studio 3.x

Author: pandamicro

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

@@ -287,6 +287,6 @@
         });
     });
 
-    load.registerParser("timeline", "*", parser);
+    load.registerParser("timeline", "1.*", parser);
 
 })(ccs._load, ccs._parser);

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

@@ -1395,7 +1395,7 @@
     });
 
 
-    load.registerParser("timeline", "2.*", parser);
+    load.registerParser("timeline", "*", parser);
 
 
 })(ccs._load, ccs._parser);