Big merge from experimental to bleeding edge.

utils/apidoc/mdn/util.dart

Index: utils/apidoc/mdn/util.dart
diff --git a/utils/apidoc/mdn/util.dart b/utils/apidoc/mdn/util.dart
index 69a4c6ca2d0729ca5b0c82a8bf3a9f6976f62629..b3389887a4d8c56d65340918569364f0121db36f 100644
--- a/utils/apidoc/mdn/util.dart
+++ b/utils/apidoc/mdn/util.dart
@@ -1,14 +1,14 @@
 library util;
 
 import 'dart:io';
-import 'dart:json';
+import 'dart:json' as json;
 
 Map<String, Map> _allProps;
 
 Map<String, Map> get allProps {
   if (_allProps == null) {
     // Database of expected property names for each type in WebKit.
-    _allProps = JSON.parse(
+    _allProps = parse.parse(
         new File('data/dartIdl.json').readAsStringSync());
   }
   return _allProps;