Revert "Revert "Rebuild nov 3 16""

This reverts commit c8ca24a000.

tests/multi_playground.html

@@ -17,10 +17,11 @@
 'use strict';
 var options = {
   comments: true,
-  disable: true,
   collapse: true,
+  disable: true,
   maxBlocks: Infinity,
   media: '../media/',
+  oneBasedIndex: true,
   readOnly: false,
   //rtl: false,
   scrollbars: true,
@@ -35,7 +36,7 @@ var options = {
     maxScale: 4,
     minScale: 0.25,
     scaleSpeed: 1.1
-  },
+  }
 };
 
 function start() {

tests/playground.html

@@ -77,8 +77,8 @@ function start() {
   // Create main workspace.
   workspace = Blockly.inject('blocklyDiv',
           {comments: true,
-           disable: true,
            collapse: true,
+           disable: true,
            grid:
              {spacing: 25,
               length: 3,
@@ -87,6 +87,7 @@ function start() {
            horizontalLayout: side == 'top' || side == 'bottom',
            maxBlocks: Infinity,
            media: '../media/',
+           oneBasedIndex: true,
            readOnly: false,
            rtl: rtl,
            scrollbars: true,
@@ -378,7 +379,7 @@ h1 {
   </p>
 
   <xml id="toolbox-simple" style="display: none">
-    <block type="controls_if"></block>
+    <block type="controls_ifelse"></block>
     <block type="logic_compare"></block>
     <!-- <block type="control_repeat"></block> -->
     <block type="logic_operation"></block>