Merge branch 'master' of https://github.com/Microsoft/TouchDevelop

.gitignore

@@ -7,10 +7,6 @@ typings
 cache
 nw_cache
 
-# shell
-cdn-cache
-shell/work/
-
 # build
 shell/npm/bin/touchdevelop.js
 shell/npm/package.json

lib/JsonParser.ts

@@ -248,19 +248,23 @@ module TDev.RT {
             }
 
             try {
-                var value = parseValue();
-                skipWhiteSpace();
-                if (current) {
-                    onerror(lf("illegal json value"));
+                return JsonObject.wrap(JSON.parse(s))
+            } catch (e) {
+                try {
+                    var value = parseValue();
+                    skipWhiteSpace();
+                    if (current) {
+                        onerror(lf("illegal json value"));
+                    }
+                    var js = JsonObject.wrap(value);
+                    return js;
+                }
+                catch(e)
+                {
+                    if (log)
+                        log(lf("error parsing json {0} {1}", s, e.message));
+                    return undefined;
                 }
-                var js = JsonObject.wrap(value);
-                return js;
-            }
-            catch(e)
-            {
-                if (log)
-                    log(lf("error parsing json {0} {1}", s, e.message));
-                return undefined;
             }
         }