Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager

Author: minggo

AUTHORS

@@ -196,6 +196,7 @@ Developers:
 
     xyhl515
         Fixed a bug that CCControlSwitch::setOn(isOn,false) doesn't work.
+        Adds VS2012 Express template installing support.
 
     DarraghCoy
         Fix for unaligned memory access crash in CCBReader::readFloat().

cocos2dx/platform/third_party/win32/libraries/libcurl.dll

@@ -0,0 +1 @@
+9f7be42cbdf2ecadd9209f4c0e1b0b9359bba4c8

cocos2dx/platform/third_party/win32/libraries/libcurl.dll.REMOVED.git-id

@@ -1283,6 +1283,12 @@ jsval ccdictionary_to_jsval(JSContext* cx, CCDictionary* dict)
 
 JSBool jsval_to_ccdictionary(JSContext* cx, jsval v, CCDictionary** ret) {
 
+    if(JSVAL_IS_NULL(v) || JSVAL_IS_VOID(v))
+    {
+        *ret = NULL;
+        return JS_TRUE;
+    }
+    
     JSObject *itEl = JS_NewPropertyIterator(cx, JSVAL_TO_OBJECT(v));
     JSBool ok = JS_TRUE;
     CCDictionary* dict = NULL;

cocos2dx/platform/third_party/win32/libraries/libcurl_imp.lib

@@ -607,7 +607,7 @@ JSBool js_cocos2dx_CCAnimation_create(JSContext *cx, uint32_t argc, jsval *vp)
 		} else if (argc == 3) {
 			unsigned int loops;
 			ok &= JS_ValueToNumber(cx, argv[1], &arg1);
-			ok &= jsval_to_uint32(cx, argv[1], &loops);
+			ok &= jsval_to_uint32(cx, argv[2], &loops);
             JSB_PRECONDITION2(ok, cx, JS_FALSE, "Error processing arguments");
 			ret = cocos2d::CCAnimation::create(arg0, arg1, loops);
 		} else if (argc == 1) {