Merge branch 'master' of https://github.com/google/coding-with-chrome

Author: MarkusBordihn

src/ui/setting_screen/setting_screen.soy

@@ -181,8 +181,8 @@
 
       <ul class="mdl-list">
         {call .setting_ data="all"}
-          {param title: 'Roboter' /}
-          {param text: 'Disable Roboter section' /}
+          {param title: 'Robots' /}
+          {param text: 'Disable Robot section' /}
           {param type: 'switch' /}
           {param id: 'section-roboter' /}
           {param opt_checked: true /}