Merge "docs: Adding new page on using GuidedStepFragment" into mnc-docs
diff --git a/Android.mk b/Android.mk
index 18d9c69..840fda0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1020,35 +1020,35 @@
 
 include $(BUILD_DROIDDOC)
 
-# ==== docs for the ndk =======================
+# ==== site updates for docs (on the androiddevdocs app engine server) =======================
 include $(CLEAR_VARS)
+
 LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
 LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)
 LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES)
 LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
 LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
 LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)
-LOCAL_DROIDDOC_HTML_DIR:=docs/html-ndk
+LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
 LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)
 LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
-# specify a second html input dir and an output path relative to OUT_DIR)
-LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl/intl /
+LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl /
 
-LOCAL_MODULE := online-ndk
+LOCAL_MODULE := online-sdk-dev
 
 LOCAL_DROIDDOC_OPTIONS:= \
 		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
 		-toroot / \
 		-hdf android.whichdoc online \
 		$(sample_groups) \
+		-useUpdatedTemplates \
 		-hdf android.hasSamples true \
 		-samplesdir $(samples_dir)
 
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
 
 include $(BUILD_DROIDDOC)
 
-
 # ==== docs that have all of the stuff that's @hidden =======================
 include $(CLEAR_VARS)
 
diff --git a/docs/html-intl/intl/es/design/index.jd b/docs/html-intl/intl/es/design/index.jd
deleted file mode 100644
index d4030e8..0000000
--- a/docs/html-intl/intl/es/design/index.jd
+++ /dev/null
@@ -1,186 +0,0 @@
-page.title=Material Design para Android
-page.tags=Material,design
-page.type=diseño
-page.image=images/cards/design-material-for-android_2x.jpg
-
-@jd:body
-
-<!-- developer docs box -->
-<a class="notice-developers right" href="{@docRoot}training/material/index.html">
-  <div>
-    <h3>Documentos para desarrolladores</h3>
-    <p>Creación de aplicaciones con Material Design</p>
-  </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=p4gmvHyuZzw">
-<div>
-    <h3>Video</h3>
-    <p>Introducción a Material Design</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=YaG_ljfzeUw">
-<div>
-    <h3>Video</h3>
-    <p>Papel y tinta: los materiales más importantes</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=XOcCOBe8PTc">
-<div>
-    <h3>Video</h3>
-    <p>Material Design en la aplicación Google I/O</p>
-</div>
-</a>
-
-
-
-<p itemprop="description">Material Design es una guía integral para el diseño visual, de movimientos y
-de interacción en distintas plataformas y dispositivos. Android ahora es compatible con las aplicaciones de
-Material Design. Para usar Material Design en tus aplicaciones de Android, sigue las pautas descritas
-en la <a href="http://www.google.com/design/spec">especificación de Material Design</a> y usa los
-nuevos componentes y funcionalidades disponibles en Android 5.0 (nivel de API 21) y versiones posteriores.</p>
-
-<p>En Android, se proporcionan los siguientes elementos que te permitirán crear aplicaciones en Material Design:</p>
-
-<ul>
-  <li>un tema nuevo;</li>
-  <li>nuevos widgets para vistas complejas;</li>
-  <li>nuevas API (interfaces de programación de aplicaciones) para sombras y animaciones personalizadas.</li>
-</ul>
-
-<p>Para obtener más información sobre la implementación de Material Design en Android, consulta
-<a href="{@docRoot}training/material/index.html">Creación de aplicaciones con Material Design</a>.</p>
-
-
-<h3>Tema Material</h3>
-
-<p>El tema Material te ofrece un nuevo estilo para tu aplicación, widgets del sistema que te permiten configurar
-la paleta de colores y animaciones predeterminadas para información táctil y transiciones de actividades.</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/MaterialDark.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">Tema Dark Material</p>
-  </div>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/MaterialLight.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">Tema Light Material</p>
-  </div>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>Para obtener más información, consulta <a href="{@docRoot}training/material/theme.html">Uso del tema
-Material</a>.</p>
-
-
-<h3>Listas y tarjetas</h3>
-
-<p>Android proporciona dos widgets nuevos para mostrar listas y tarjetas con estilos y
-animaciones de Material Design:</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/list_mail.png" width="500" height="426" />
-  <p>El nuevo widget <code>RecyclerView</code> es una versión más acoplable de <code>ListView</code>
- que admite diferentes tipos de diseños y proporciona mejoras en el rendimiento.</p>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/card_travel.png" width="500" height="426" />
-  <p>El nuevo widget <code>CardView</code> te permite mostrar extractos de información importante dentro de
- tarjetas que tienen apariencia y estilo coherentes.</p>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>Para obtener más información, consulta <a href="{@docRoot}training/material/lists-cards.html">Creación de listas
-y tarjetas</a>.</p>
-
-
-<h3>Visualización de sombras</h3>
-
-<p>Además de las propiedades X e Y, las vistas de Android ahora poseen una
-propiedad Z. Esta propiedad nueva representa la elevación de una vista, que determina lo siguiente:</p>
-
-<ul>
-<li>El tamaño de la sombra: las vistas con valores Z más elevados proyectan sombras más grandes.</li>
-<li>El orden del dibujo: las vistas con valores Z más elevados aparecen sobre las otras vistas.</li>
-</ul>
-
-<div style="width:290px;margin-left:35px;float:right">
-  <div class="framed-nexus5-port-span-5">
-  <video class="play-on-hover" autoplay>
-    <source src="{@docRoot}design/material/videos/ContactsAnim.mp4"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.webm"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.ogv"/>
-  </video>
-  </div>
-  <div style="font-size:10pt;margin-left:20px;margin-bottom:30px">
-    <em>Para volver a reproducir la película, haz clic en la pantalla del dispositivo.</em>
-  </div>
-</div>
-
-<p>Para obtener más información, consulta <a href="{@docRoot}training/material/shadows-clipping.html">Definición
-de vistas de recorte y sombras</a>.</p>
-
-
-<h3>Animaciones</h3>
-
-<p>Las nuevas API de animaciones te permiten crear animaciones personalizadas para la información táctil en los controles de IU,
-además de realizar cambios en el estado de las vistas y transiciones entre actividades.</p>
-
-<p>Estas API te permiten hacer lo siguiente:</p>
-
-<ul>
-<li style="margin-bottom:15px">
-responder a los eventos táctiles de tus vistas mediante animaciones de <strong>información táctil</strong>;
-</li>
-<li style="margin-bottom:15px">
-ocultar y mostrar vistas con animaciones con <strong>efecto circular</strong>;
-</li>
-<li style="margin-bottom:15px">
-alternar entre actividades con animaciones personalizadas de <strong>transición de actividades</strong>;
-</li>
-<li style="margin-bottom:15px">
-crear animaciones más naturales con <strong>movimiento curvo</strong>;
-</li>
-<li style="margin-bottom:15px">
-animar los cambios en una o más propiedades de las vistas con las animaciones de <strong>cambio de estado de la vista</strong>;
-</li>
-<li style="margin-bottom:15px">
-mostrar animaciones en los <strong>elementos de diseño de la lista de estados</strong> entre los cambios de estado de las vistas.
-</li>
-</ul>
-
-<p>Las animaciones de la información táctil se concentran en diferentes vistas estándar, como los botones. Las nuevas API
-te permiten personalizar estas animaciones y agregarlas a tus vistas personalizadas.</p>
-
-<p>Para obtener más información, consulta <a href="{@docRoot}training/material/animations.html">Definición de animaciones
-personalizadas</a>.</p>
-
-
-<h3>Elementos de diseño</h3>
-
-<p>Estas nuevas capacidades para los elementos de diseño te permiten implementar aplicaciones de Material Design:</p>
-
-<ul>
-<li>Los <strong>dibujables en vector</strong> se pueden escalar sin perder definición y son perfectos
-para los iconos de las aplicaciones de un solo color.</li>
-<li>El <strong>teñido de los dibujables</strong> te permite definir mapas de bits como máscaras alfa y pintarlos con
-un color durante el tiempo de ejecución.</li>
-<li>La <strong>extracción de color</strong> te permite extraer automáticamente colores prominentes de una
-imagen del mapa de bits.</li>
-</ul>
-
-<p>Para obtener más información, consulta <a href="{@docRoot}training/material/drawables.html">Trabajo con
-elementos de diseño</a>.</p>
diff --git a/docs/html-intl/intl/es/index.jd b/docs/html-intl/intl/es/index.jd
index 89f6362..46974cfe 100644
--- a/docs/html-intl/intl/es/index.jd
+++ b/docs/html-intl/intl/es/index.jd
@@ -5,6 +5,16 @@
 
 @jd:body
 
+<script>
+  $(document).ready(function() {
+    if (useUpdatedTemplates) {
+      $("#useUpdatedTemplates").css("display","block");
+    } else {
+      $("#useOldTemplates").css("display","block");
+    }
+  })
+</script>
+
 <!-- <div class="dac-hero-carousel" data-carousel-query="collection:index/carousel">
 </div> -->
 <section class="dac-hero-carousel">
@@ -39,11 +49,39 @@
 </a>
 </article></section>
 
-<div class="actions-bar dac-expand dac-invert">
+<div id="useUpdatedTemplates" style="display:none" class="dac-section dac-slim dac-gray dac-expand">
   <div class="wrap dac-offset-parent">
     <a class="dac-fab dac-scroll-button" data-scroll-button href="#build-apps">
       <i class="dac-sprite dac-arrow-down-gray"></i>
     </a>
+    <ul class="dac-actions">
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}sdk/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Get the SDK
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}samples/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Browse sample code
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}distribute/stories/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Watch stories
+        </a>
+      </li>
+    </ul>
+  </div><!-- end .wrap -->
+</div><!-- end .dac-actions -->
+
+<div id="useOldTemplates" style="display:none" class="actions-bar dac-expand dac-invert">
+  <div class="wrap dac-offset-parent">
+    <a class="dac-fab dac-scroll-button" data-scroll-button="" href="#build-apps">
+      <i class="dac-sprite dac-arrow-down-gray"></i>
+    </a>
     <div class="actions">
       <div><a href="{@docRoot}sdk/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
@@ -53,17 +91,15 @@
         <span class="dac-sprite dac-auto-chevron-large"></span>
         Browse Samples
       </a></div>
-      <div><a href="//www.youtube.com/user/androiddevelopers">
+      <div><a href="{@docRoot}distribute/stories/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
-        Watch Videos
+        Watch Stories
       </a></div>
     </div><!-- end .actions -->
   </div><!-- end .wrap -->
-</div><!-- end .actions-bar -->
+</div>
 
-
-
-<section class="dac-section dac-section-light" id="build-apps"><div class="wrap">
+<section class="dac-section dac-light" id="build-apps"><div class="wrap">
   <h1 class="dac-section-title">Build Beautiful Apps</h1>
   <div class="dac-section-subtitle">
     Resources to get you started with designing and developing for Android.
diff --git a/docs/html-intl/intl/in/design/index.jd b/docs/html-intl/intl/in/design/index.jd
deleted file mode 100644
index 8bc12ed..0000000
--- a/docs/html-intl/intl/in/design/index.jd
+++ /dev/null
@@ -1,186 +0,0 @@
-page.title=Desain Bahan untuk Android
-page.tags=Material,design
-page.type=desain
-page.image=images/cards/design-material-for-android_2x.jpg
-
-@jd:body
-
-<!-- developer docs box -->
-<a class="notice-developers right" href="{@docRoot}training/material/index.html">
-  <div>
-    <h3>Dokumen Pengembang</h3>
-    <p>Membuat Aplikasi dengan Desain Bahan</p>
-  </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=p4gmvHyuZzw">
-<div>
-    <h3>Video</h3>
-    <p>Pengantar Desain Bahan</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=YaG_ljfzeUw">
-<div>
-    <h3>Video</h3>
-    <p>Kertas dan Tinta: Bahan Penting</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=XOcCOBe8PTc">
-<div>
-    <h3>Video</h3>
-    <p>Desain Bahan di Aplikasi Google I/O</p>
-</div>
-</a>
-
-
-
-<p itemprop="description">Desain bahan adalah panduan komprehensif untuk desain visual, gerak, dan
-interaksi lintas platform dan perangkat. Android kini menyertakan dukungan untuk
-aplikasi desain bahan. Untuk menggunakan desain bahan di aplikasi Android, ikuti panduan yang didefinisikan
-dalam <a href="http://www.google.com/design/spec">spesifikasi desain bahan</a> dan gunakan
-komponen dan fungsionalitas baru yang tersedia di Android 5.0 (API level 21) ke atas.</p>
-
-<p>Android menyediakan elemen berikut untuk membangun aplikasi desain bahan:</p>
-
-<ul>
-  <li>Tema baru</li>
-  <li>Widget baru untuk tampilan yang kompleks</li>
-  <li>API baru untuk animasi dan bayangan custom</li>
-</ul>
-
-<p>Untuk informasi selengkapnya tentang mengimplementasikan desain bahan pada Android, lihat
-<a href="{@docRoot}training/material/index.html">Membuat Aplikasi dengan Desain Bahan</a>.</p>
-
-
-<h3>Tema Bahan</h3>
-
-<p>Tema bahan menyediakan gaya baru untuk aplikasi Anda, widget sistem yang memungkinkan Anda mengatur
-palet warnanya, dan animasi default untuk umpan balik sentuh dan transisi aktivitas.</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/MaterialDark.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">Tema bahan gelap</p>
-  </div>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/MaterialLight.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">Tema bahan terang</p>
-  </div>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>Untuk informasi selengkapnya, lihat <a href="{@docRoot}training/material/theme.html">Menggunakan Tema
-Bahan</a>.</p>
-
-
-<h3>Daftar dan Kartu</h3>
-
-<p>Android menyediakan dua widget baru untuk menampilkan kartu dan daftar dengan gaya desain bahan
-dan animasi:</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/list_mail.png" width="500" height="426" />
-  <p>Widget <code>RecyclerView</code> baru adalah versi <code>ListView</code>
- yang lebih mudah dimasukkan dan mendukung beragam tipe layout serta memberikan peningkatan kinerja.</p>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/card_travel.png" width="500" height="426" />
-  <p>Widget <code>CardView</code> baru memungkinkan Anda menampilkan potongan informasi penting dalam
-  kartu yang memiliki tampilan dan cara kerja yang konsisten.</p>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>Untuk informasi selengkapnya, lihat <a href="{@docRoot}training/material/lists-cards.html">Membuat Daftar
-dan Kartu</a>.</p>
-
-
-<h3>Bayangan Tampilan</h3>
-
-<p>Selain properti X dan Y, tampilan di Android kini memiliki
-properti Z. Properti baru ini mewakili ketinggian tampilan, yang menentukan:</p>
-
-<ul>
-<li>Ukuran bayangan: tampilan dengan nilai Z lebih tinggi menghasilkan bayangan lebih besar.</li>
-<li>Urutan penggambaran: tampilan dengan nilai Z lebih tinggi muncul di atas tampilan lainnya.</li>
-</ul>
-
-<div style="width:290px;margin-left:35px;float:right">
-  <div class="framed-nexus5-port-span-5">
-  <video class="play-on-hover" autoplay>
-    <source src="{@docRoot}design/material/videos/ContactsAnim.mp4"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.webm"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.ogv"/>
-  </video>
-  </div>
-  <div style="font-size:10pt;margin-left:20px;margin-bottom:30px">
-    <em>Untuk memutar ulang film, klik layar perangkat</em>
-  </div>
-</div>
-
-<p>Untuk informasi selengkapnya, lihat <a href="{@docRoot}training/material/shadows-clipping.html">Mendefinisikan
-Bayangan dan Memangkas Tampilan</a>.</p>
-
-
-<h3>Animasi</h3>
-
-<p>API animasi baru memungkinkan Anda membuat animasi custom untuk umpan balik sentuh dalam kontrol UI,
-perubahan status tampilan, dan transisi aktivitas.</p>
-
-<p>API ini memungkinkan Anda:</p>
-
-<ul>
-<li style="margin-bottom:15px">
-Merespons kejadian sentuh dalam tampilan Anda dengan animasi <strong>umpan balik sentuh</strong>.
-</li>
-<li style="margin-bottom:15px">
-Menyembunyikan dan memperlihatkan tampilan dengan animasi <strong>membuka melingkar</strong>.
-</li>
-<li style="margin-bottom:15px">
-Peralihan antar aktivitas dengan animasi <strong>transisi aktivitas</strong> custom.
-</li>
-<li style="margin-bottom:15px">
-Membuat animasi yang lebih alami dengan <strong>gerak melengkung</strong>.
-</li>
-<li style="margin-bottom:15px">
-Menganimasikan perubahan dalam satu atau beberapa properti tampilan dengan animasi <strong>perubahan status tampilan</strong>.
-</li>
-<li style="margin-bottom:15px">
-Menampilkan animasi di <strong>drawable daftar status</strong> di antara perubahan status tampilan.
-</li>
-</ul>
-
-<p>Animasi umpan balik sentuh dimasukkan ke dalam beberapa tampilan standar, misalnya tombol. API baru
-ini memungkinkan Anda menyesuaikan animasi ini dan menambahkannya ke tampilan custom Anda.</p>
-
-<p>Untuk informasi selengkapnya, lihat <a href="{@docRoot}training/material/animations.html">Mendefinisikan Animasi
-Custom</a>.</p>
-
-
-<h3>Drawable</h3>
-
-<p>Kemampuan baru untuk drawable ini membantu Anda mengimplementasikan aplikasi desain bahan:</p>
-
-<ul>
-<li><strong>Drawable vektor</strong> bisa diubah skalanya tanpa kehilangan definisi dan cocok
-untuk ikon satu-warna dalam-aplikasi.</li>
-<li><strong>Pewarnaan drawable</strong> memungkinkan Anda mendefinisikan bitmap sebagai alpha-mask dan mewarnainya
-saat runtime.</li>
-<li><strong>Ekstraksi warna</strong> memungkinkan Anda mengekstrak warna mencolok secara otomatis dari
-gambar bitmap.</li>
-</ul>
-
-<p>Untuk informasi selengkapnya, lihat <a href="{@docRoot}training/material/drawables.html">Bekerja dengan
-Drawable</a>.</p>
diff --git a/docs/html-intl/intl/in/design/material/index.jd b/docs/html-intl/intl/in/design/material/index.jd
index 28cfd52..0cb4dbc 100644
--- a/docs/html-intl/intl/in/design/material/index.jd
+++ b/docs/html-intl/intl/in/design/material/index.jd
@@ -1,4 +1,4 @@
-page.title=Desain Bahan untuk Android
+page.title=Material Design for Android
 page.tags=Material,design
 page.type=design
 page.image=images/cards/design-material-for-android_2x.jpg
@@ -25,11 +25,7 @@
 <a class="notice-developers-video" href="https://www.youtube.com/watch?v=YaG_ljfzeUw">
 <div>
     <h3>Video</h3>
-<<<<<<< HEAD
     <p>Kertas dan Tinta: Bahan Penting</p>
-=======
-    <p>Kertas dan Tinta: Bahan-Bahan Penting</p>
->>>>>>> Docs: L10N update for design documentation
 </div>
 </a>
 
@@ -37,17 +33,12 @@
 <a class="notice-developers-video" href="https://www.youtube.com/watch?v=XOcCOBe8PTc">
 <div>
     <h3>Video</h3>
-<<<<<<< HEAD
     <p>Desain Bahan di Aplikasi Google I/O</p>
-=======
-    <p>Desain Bahan dalam Aplikasi Google I/O</p>
->>>>>>> Docs: L10N update for design documentation
 </div>
 </a>
 
 
 
-<<<<<<< HEAD
 <p itemprop="description">Desain bahan adalah panduan komprehensif untuk desain visual, gerak, dan
 interaksi lintas platform dan perangkat. Android kini menyertakan dukungan untuk
 aplikasi desain bahan. Untuk menggunakan desain bahan di aplikasi Android, ikuti panduan yang didefinisikan
@@ -60,20 +51,6 @@
   <li>Tema baru</li>
   <li>Widget baru untuk tampilan yang kompleks</li>
   <li>API baru untuk animasi dan bayangan custom</li>
-=======
-<p itemprop="description">Desain bahan adalah panduan komprehensif untuk desain visual, gerakan, dan
-interaksi lintas platform dan perangkat. Android sekarang memasukkan dukungan untuk
-aplikasi desain bahan. Untuk menggunakan desain bahan dalam aplikasi Android Anda, ikuti panduan yang didefinisikan
-dalam <a href="http://www.google.com/design/spec">spesifikasi desain bahan</a> dan gunakan
-komponen dan fungsionalitas baru yang tersedia dalam Android 5.0 (API level 21) dan yang di atasnya.</p>
-
-<p>Android menyediakan elemen-elemen berikut bagi Anda untuk membuat aplikasi desain bahan:</p>
-
-<ul>
-  <li>Tema baru</li>
-  <li>Widget baru untuk tampilan kompleks</li>
-  <li>API baru untuk bayangan dan animasi custom</li>
->>>>>>> Docs: L10N update for design documentation
 </ul>
 
 <p>Untuk informasi selengkapnya tentang mengimplementasikan desain bahan pada Android, lihat
@@ -83,11 +60,7 @@
 <h3>Tema Bahan</h3>
 
 <p>Tema bahan menyediakan gaya baru untuk aplikasi Anda, widget sistem yang memungkinkan Anda mengatur
-<<<<<<< HEAD
 palet warnanya, dan animasi default untuk umpan balik sentuh dan transisi aktivitas.</p>
-=======
-palet warna, dan animasi default untuk umpan balik sentuh serta transisi aktivitas.</p>
->>>>>>> Docs: L10N update for design documentation
 
 <!-- two columns -->
 <div style="width:700px;margin-top:25px;margin-bottom:20px">
@@ -119,7 +92,6 @@
 <div style="width:700px;margin-top:25px;margin-bottom:20px">
 <div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
   <img src="{@docRoot}design/material/images/list_mail.png" width="500" height="426" />
-<<<<<<< HEAD
   <p>Widget <code>RecyclerView</code> baru adalah versi <code>ListView</code>
  yang lebih mudah dimasukkan dan mendukung beragam tipe layout serta memberikan peningkatan kinerja.</p>
 </div>
@@ -127,15 +99,6 @@
   <img src="{@docRoot}design/material/images/card_travel.png" width="500" height="426" />
   <p>Widget <code>CardView</code> baru memungkinkan Anda menampilkan potongan informasi penting dalam
   kartu yang memiliki tampilan dan cara kerja yang konsisten.</p>
-=======
-  <p>Widget <code>RecyclerView</code> baru adalah versi yang lebih mudah dimasukkan untuk <code>ListView</code>
-  yang mendukung tipe layout berbeda dan memberikan peningkatan kinerja.</p>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/card_travel.png" width="500" height="426" />
-  <p>Widget <code>CardView</code> baru memungkinkan Anda menampilkan bagian informasi penting di dalam
-  kartu yang memiliki tampilan dan gaya konsisten.</p>
->>>>>>> Docs: L10N update for design documentation
 </div>
 <br style="clear:left"/>
 </div>
@@ -146,21 +109,12 @@
 
 <h3>Bayangan Tampilan</h3>
 
-<<<<<<< HEAD
 <p>Selain properti X dan Y, tampilan di Android kini memiliki
 properti Z. Properti baru ini mewakili ketinggian tampilan, yang menentukan:</p>
 
 <ul>
 <li>Ukuran bayangan: tampilan dengan nilai Z lebih tinggi menghasilkan bayangan lebih besar.</li>
 <li>Urutan penggambaran: tampilan dengan nilai Z lebih tinggi muncul di atas tampilan lainnya.</li>
-=======
-<p>Selain properti X dan Y, tampilan dalam Android sekarang memiliki
-properti Z. Properti baru ini mewakili ketinggian pandangan, yang menentukan:</p>
-
-<ul>
-<li>Ukuran bayangan: tampilan dengan nilai Z lebih tinggi membentuk bayangan yang lebih besar.</li>
-<li>Urutan penggambaran: tampilan dengan nilai Z lebih tinggi akan muncul di atas tampilan lain.</li>
->>>>>>> Docs: L10N update for design documentation
 </ul>
 
 <div style="width:290px;margin-left:35px;float:right">
@@ -172,36 +126,23 @@
   </video>
   </div>
   <div style="font-size:10pt;margin-left:20px;margin-bottom:30px">
-<<<<<<< HEAD
     <em>Untuk memutar ulang film, klik layar perangkat</em>
-=======
-    <em>Untuk memutar ulang film, klik pada layar perangkat</em>
->>>>>>> Docs: L10N update for design documentation
   </div>
 </div>
 
 <p>Untuk informasi selengkapnya, lihat <a href="{@docRoot}training/material/shadows-clipping.html">Mendefinisikan
-<<<<<<< HEAD
 Bayangan dan Memangkas Tampilan</a>.</p>
-=======
-Bayangan dan Memotong Tampilan</a>.</p>
->>>>>>> Docs: L10N update for design documentation
 
 
 <h3>Animasi</h3>
 
 <p>API animasi baru memungkinkan Anda membuat animasi custom untuk umpan balik sentuh dalam kontrol UI,
-<<<<<<< HEAD
 perubahan status tampilan, dan transisi aktivitas.</p>
-=======
-perubahan dalam status tampilan, dan transisi aktivitas.</p>
->>>>>>> Docs: L10N update for design documentation
 
 <p>API ini memungkinkan Anda:</p>
 
 <ul>
 <li style="margin-bottom:15px">
-<<<<<<< HEAD
 Merespons kejadian sentuh dalam tampilan Anda dengan animasi <strong>umpan balik sentuh</strong>.
 </li>
 <li style="margin-bottom:15px">
@@ -212,38 +153,17 @@
 </li>
 <li style="margin-bottom:15px">
 Membuat animasi yang lebih alami dengan <strong>gerak melengkung</strong>.
-=======
-Merespons terjadinya sentuhan dalam tampilan Anda dengan animasi <strong>umpan balik sentuh</strong>.
-</li>
-<li style="margin-bottom:15px">
-Menyembunyikan dan menampilkan tampilan dengan animasi <strong>penampakan sirkuler</strong>.
-</li>
-<li style="margin-bottom:15px">
-Beralih antar aktivitas dengan animasi <strong>transisi aktivitas</strong> custom.
-</li>
-<li style="margin-bottom:15px">
-Membuat animasi yang lebih alami dengan <strong>gerakan melingkar</strong>.
->>>>>>> Docs: L10N update for design documentation
 </li>
 <li style="margin-bottom:15px">
 Menganimasikan perubahan dalam satu atau beberapa properti tampilan dengan animasi <strong>perubahan status tampilan</strong>.
 </li>
 <li style="margin-bottom:15px">
-<<<<<<< HEAD
 Menampilkan animasi di <strong>drawable daftar status</strong> di antara perubahan status tampilan.
 </li>
 </ul>
 
 <p>Animasi umpan balik sentuh dimasukkan ke dalam beberapa tampilan standar, misalnya tombol. API baru
 ini memungkinkan Anda menyesuaikan animasi ini dan menambahkannya ke tampilan custom Anda.</p>
-=======
-Menampilkan animasi dalam <strong>drawable daftar status</strong> di antara perubahan status tampilan.
-</li>
-</ul>
-
-<p>Animasi umpan balik sentuh dimasukkan ke dalam beberapa tampilan standar, misalnya tombol. API
-baru ini memungkinkan Anda menyesuaikan animasi ini dan menambahkannya ke tampilan custom.</p>
->>>>>>> Docs: L10N update for design documentation
 
 <p>Untuk informasi selengkapnya, lihat <a href="{@docRoot}training/material/animations.html">Mendefinisikan Animasi
 Custom</a>.</p>
@@ -254,7 +174,6 @@
 <p>Kemampuan baru untuk drawable ini membantu Anda mengimplementasikan aplikasi desain bahan:</p>
 
 <ul>
-<<<<<<< HEAD
 <li><strong>Drawable vektor</strong> bisa diubah skalanya tanpa kehilangan definisi dan cocok
 untuk ikon satu-warna dalam-aplikasi.</li>
 <li><strong>Pewarnaan drawable</strong> memungkinkan Anda mendefinisikan bitmap sebagai alpha-mask dan mewarnainya
@@ -264,15 +183,4 @@
 </ul>
 
 <p>Untuk informasi selengkapnya, lihat <a href="{@docRoot}training/material/drawables.html">Bekerja dengan
-=======
-<li><strong>Drawable vektor</strong> dapat diskalakan tanpa kehilangan ketajaman dan cocok
-untuk ikon satu-warna dalam-aplikasi.</li>
-<li><strong>Pewarnaan drawable</strong> memungkinkan Anda mendefinisikan bitmap sebagai
-alpha-mask dan mewarnainya dengan satu warna saat runtime.</li>
-<li><strong>Ekstraksi warna</strong> memungkinkan Anda secara otomatis mengekstrak warna
-penting dari gambar bitmap.</li>
-</ul>
-
-<p>Untuk informasi selengkapnya, lihat <a href="{@docRoot}training/material/drawables.html">Menggunakan
->>>>>>> Docs: L10N update for design documentation
 Drawable</a>.</p>
diff --git a/docs/html-intl/intl/in/sdk/index.jd b/docs/html-intl/intl/in/sdk/index.jd
index 712e8ea..248a4b8 100644
--- a/docs/html-intl/intl/in/sdk/index.jd
+++ b/docs/html-intl/intl/in/sdk/index.jd
@@ -1,62 +1,15 @@
 page.title=Unduh Android Studio dan SDK Tools
 page.tags=sdk, android studio
+page.image=images/cards/android-studio_2x.png
 page.template=sdk
+page.image=images/cards/android-studio_2x.png
 header.hide=1
 page.metaDescription=Unduh Android IDE resmi dan alat pengembang untuk membuat aplikasi bagi ponsel, tablet, perangkat wearable, TV Android dan lainnya.
 
-studio.version=1.4.0.10
-
-studio.linux_bundle_download=android-studio-ide-141.2288178-linux.zip
-studio.linux_bundle_bytes=380821638
-studio.linux_bundle_checksum=137e3734f2e8e285bd7c1d2fae2e8548d0f164bd
-
-studio.mac_bundle_download=android-studio-ide-141.2288178-mac.dmg
-studio.mac_bundle_bytes=364624965
-studio.mac_bundle_checksum=27068d59d5a78717d31bdedd054082b5c50d3897
-
-studio.win_bundle_download=android-studio-ide-141.2288178-windows.zip
-studio.win_bundle_bytes=373492997
-studio.win_bundle_checksum=c0851dc9a506ba9f4c1379a3e9b4019c08478220
-
-
-studio.win_bundle_exe_download=android-studio-bundle-141.2288178-windows.exe
-studio.win_bundle_exe_bytes=1177811944
-studio.win_bundle_exe_checksum=a2f0141d35f8f0c24dad2ff390e7f6231c5f7625
-
-studio.win_notools_exe_download=android-studio-ide-141.2288178-windows.exe
-studio.win_notools_exe_bytes=348295968
-studio.win_notools_exe_checksum=82d0d9c78ec23834956f941a07821be347fcb7bf
-
-
-
-
-sdk.linux_download=android-sdk_r24.3.4-linux.tgz
-sdk.linux_bytes=309138331
-sdk.linux_checksum=fb293d7bca42e05580be56b1adc22055d46603dd
-
-sdk.mac_download=android-sdk_r24.3.4-macosx.zip
-sdk.mac_bytes=98340900
-sdk.mac_checksum=128f10fba668ea490cc94a08e505a48a608879b9
-
-sdk.win_download=android-sdk_r24.3.4-windows.zip
-sdk.win_bytes=187496897
-sdk.win_checksum=4a8718fb4a2bf2128d34b92f23ddd79fc65839e7
-
-
-sdk.win_installer=installer_r24.3.4-windows.exe
-sdk.win_installer_bytes=139477985
-sdk.win_installer_checksum=094dd45f98a31f839feae898b48f23704f2878dd
-
-
-
-
-
-
 @jd:body
 
 <style type="text/css">
   .offline {display:none;}
-  a.download-bundle-button {display:block;}
   h2.feature {
     padding-top:30px;
     margin-top:0;
@@ -64,20 +17,7 @@
   }
   .feature-blurb {
   margin:0px; font-size:16px; font-weight:300;
-  padding:40px 0 0 0;
-  }
-
-  .landing-button.green {
-    font-size:16px;
-    background-color:#90c653;
-    padding:8px 10px 10px;
-    margin:0;
-    width:206px;
-    text-align:center;
-  }
-
-  .landing-button.green:hover {
-    background-color:#85b84f;
+  padding-top:40px;
   }
 
   .landing-button .small {
@@ -95,8 +35,8 @@
     white-space: nowrap;
     text-indent: -10000px;
     font-size:0px;
-    background: url(../images/tools/studio-logo.png);
-    background-image: -webkit-image-set(url(../images/tools/studio-logo.png) 1x, url(../images/tools/studio-logo_2x.png) 2x);
+    background: url({@docRoot}images/tools/studio-logo.png);
+    background-image: -webkit-image-set(url({@docRoot}images/tools/studio-logo.png) 1x, url({@docRoot}images/tools/studio-logo_2x.png) 2x);
     background-size: 226px 78px;
   }
 
@@ -283,8 +223,9 @@
 
 <div class="col-13">&nbsp;</div><!-- provides top margin for content -->
 
-<img src="{@docRoot}images/tools/studio-hero.png" srcset="{@docRoot}images/tools/studio-hero_2x.png 2x, {@docRoot}images/tools/studio-hero.png 1x" width="760" height="400" />
-
+<img src="{@docRoot}images/tools/studio-hero.png"
+srcset="{@docRoot}images/tools/studio-hero_2x.png 2x, {@docRoot}images/tools/studio-hero.png 1x"
+width="760" alt="" />
 
 <div style="color: #fff; width:226px; height:0; overflow:visible; position:absolute; top:40px; left:25px">
 
@@ -293,15 +234,15 @@
 <p style="font-size: 16px; color:#bbb; position: absolute;left: 297px; top: 5px; display: block;
 width: 400px;text-align: center;">Android IDE resmi</p>
 
-<ul style="font-size:12px">
+<ul style="font-size:12px;line-height:19px;">
 <li>Android Studio IDE</li>
 <li>Android SDK Tools</li>
 <li>Platform Android 6.0 (Marshmallow)</li>
 <li>Citra sistem emulator Android 6.0 dengan Google API</li>
 </ul>
 
-
-<a class="online landing-button green download-bundle-button" style="margin-top:30px;" href="#Other">Unduh</a>
+<a class="online landing-button green download-bundle-button"
+href="#Other" >Download Android Studio<br/><span class='small'></span></a>
 
 <!-- this appears when viewing the offline docs -->
 <p class="offline">
diff --git a/docs/html-intl/intl/in/sdk/installing/adding-packages.jd b/docs/html-intl/intl/in/sdk/installing/adding-packages.jd
index b98e27b..2fc5c3e 100644
--- a/docs/html-intl/intl/in/sdk/installing/adding-packages.jd
+++ b/docs/html-intl/intl/in/sdk/installing/adding-packages.jd
@@ -1,7 +1,6 @@
 page.title=Menambahkan Paket SDK
 
 page.tags=sdk manager
-helpoutsWidget=true
 
 @jd:body
 
@@ -31,7 +30,7 @@
   line-height:20px;
   padding:0 0 0 20px;
   margin:0 0 20px 0;
-  display:inline-block;
+  display:inline;
   font-weight:normal;
 }
 ol.large > li:nth-child(1):before {
diff --git a/docs/html-intl/intl/in/training/material/index.jd b/docs/html-intl/intl/in/training/material/index.jd
index 625f02d..53697d2 100644
--- a/docs/html-intl/intl/in/training/material/index.jd
+++ b/docs/html-intl/intl/in/training/material/index.jd
@@ -1,6 +1,5 @@
 page.title=Desain Bahan untuk Pengembang
-page.type=desain
-page.image=gambar/kartu/material_2x.png
+page.image=images/cards/material_2x.png
 page.metaDescription=Pelajari cara menerapkan desain bahan pada aplikasi Anda.
 
 
diff --git a/docs/html-intl/intl/ja/design/index.jd b/docs/html-intl/intl/ja/design/index.jd
deleted file mode 100644
index e8c0f54..0000000
--- a/docs/html-intl/intl/ja/design/index.jd
+++ /dev/null
@@ -1,186 +0,0 @@
-page.title=Android のマテリアル デザイン
-page.tags=Material,design
-page.type=デザイン
-page.image=images/cards/design-material-for-android_2x.jpg
-
-@jd:body
-
-<!-- developer docs box -->
-<a class="notice-developers right" href="{@docRoot}training/material/index.html">
-  <div>
-    <h3>デベロッパー ドキュメント</h3>
-    <p>マテリアル デザインを使用したアプリの作成</p>
-  </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=p4gmvHyuZzw">
-<div>
-    <h3>ビデオ</h3>
-    <p>マテリアル デザインについて</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=YaG_ljfzeUw">
-<div>
-    <h3>ビデオ</h3>
-    <p>紙とインク: 重要なマテリアル</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=XOcCOBe8PTc">
-<div>
-    <h3>ビデオ</h3>
-    <p>Google I/O アプリのマテリアル デザイン</p>
-</div>
-</a>
-
-
-
-<p itemprop="description">マテリアル デザインは、複数のプラットフォームや端末の視覚、モーション、インタラクション デザインの包括的な指針です。
-Android はマテリアル デザイン アプリに対応するようになりました。
-Android アプリでマテリアル デザインを使うには、<a href="http://www.google.com/design/spec">マテリアル デザインの仕様</a>で定義されているガイドラインに従い、Android 5.0(API レベル 21)以降の新しいコンポーネントや機能を使用します。
-
-</p>
-
-<p>Android にはマテリアル デザインのアプリのビルドに使用できる次の要素が用意されています。</p>
-
-<ul>
-  <li>新しいテーマ</li>
-  <li>複雑なビューに対応した新しいウィジェット</li>
-  <li>カスタムのシャドウとアニメーション用の新しい API</li>
-</ul>
-
-<p>Android でのマテリアル デザインの実装については、<a href="{@docRoot}training/material/index.html">マテリアル デザインを使用したアプリの作成</a>をご覧ください。
-</p>
-
-
-<h3>マテリアル テーマ</h3>
-
-<p>マテリアル テーマには、アプリの新しいスタイルであるシステム ウィジェットがあります。このシステム ウィジェットを使うと、システム ウィジェットのカラーパレットを設定したり、タッチ フィードバックやアクティビティ遷移のためのデフォルトのアニメーションを設定したりできます。
-</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/MaterialDark.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">暗い色のマテリアル テーマ</p>
-  </div>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/MaterialLight.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">明るい色のマテリアル テーマ</p>
-  </div>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>詳細については、<a href="{@docRoot}training/material/theme.html">マテリアル テーマの使用</a>をご覧ください。
-</p>
-
-
-<h3>リストとカード</h3>
-
-<p>Android はマテリアル デザインのスタイルとアニメーションを含むカードとリストを表示する、次のような新しい 2 つのウィジェットを提供しています。
-</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/list_mail.png" width="500" height="426" />
-  <p>新しい <code>RecyclerView</code> ウィジェットは <code>ListView</code>
- に比べてさらに柔軟に機能を追加できるようになっており、さまざまなレイアウト タイプをサポートしてパフォーマンスを向上させます。</p>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/card_travel.png" width="500" height="426" />
-  <p>新しい <code>CardView</code> ウィジェットではカードの外観や操作性が統一され、カード内の重要な情報を表示できるようになりました。
-</p>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>詳細については、<a href="{@docRoot}training/material/lists-cards.html">リストとカードの作成</a>をご覧ください。
-</p>
-
-
-<h3>シャドウの表示</h3>
-
-<p>Android のビューに、X と Y のプロパティに加えて Z プロパティが追加されました。
-この新しいプロパティはビューのエレベーションを表し、次の要素を指定します。</p>
-
-<ul>
-<li>シャドウのサイズ: ビューの Z 値が高いほどシャドウのサイズが大きくなります。</li>
-<li>描画順序: ビューの Z 値が高いほど他のビューの前面に表示されます。</li>
-</ul>
-
-<div style="width:290px;margin-left:35px;float:right">
-  <div class="framed-nexus5-port-span-5">
-  <video class="play-on-hover" autoplay>
-    <source src="{@docRoot}design/material/videos/ContactsAnim.mp4"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.webm"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.ogv"/>
-  </video>
-  </div>
-  <div style="font-size:10pt;margin-left:20px;margin-bottom:30px">
-    <em>端末の画像をクリックすると動画を再生できます</em>
-  </div>
-</div>
-
-<p>詳細については、<a href="{@docRoot}training/material/shadows-clipping.html">シャドウとクリッピング ビューの定義</a>をご覧ください。
-</p>
-
-
-<h3>アニメーション</h3>
-
-<p>新しいアニメーション API を使って、UI コントロールのタッチ フィードバック、ビューの状態変化、アクティビティ間の遷移時のカスタム アニメーションを作成できます。
-</p>
-
-<p>この API で次のようなことができます。</p>
-
-<ul>
-<li style="margin-bottom:15px">
-<strong>タッチ フィードバック</strong> アニメーションでビューのタップ イベントに応答する。
-</li>
-<li style="margin-bottom:15px">
-<strong>円形状の出現</strong>アニメーションを使ってビューを表示したり、非表示にしたりする。
-</li>
-<li style="margin-bottom:15px">
-カスタムの<strong>アクティビティ遷移</strong>アニメーションを使ってアクティビティを切り替える。
-</li>
-<li style="margin-bottom:15px">
-<strong>曲線モーション</strong>を使ってより自然なアニメーションを作成する。
-</li>
-<li style="margin-bottom:15px">
-<strong>ビューの状態変化</strong>アニメーションを使って 1 つ以上のビュー プロパティを変化させるアニメーションを作成する。
-</li>
-<li style="margin-bottom:15px">
-ビューの状態を変化させるアニメーションを<strong>状態リスト ドローアブル</strong>で表示します。
-</li>
-</ul>
-
-<p>タッチ フィードバック アニメーションはボタンなどの複数の標準ビューに組み込まれています。新しい API を使うと、これらのアニメーションをカスタマイズして、カスタム ビューに追加できます。
-</p>
-
-<p>詳細については、<a href="{@docRoot}training/material/animations.html">カスタム アニメーションの定義</a>をご覧ください。
-</p>
-
-
-<h3>ドローアブル</h3>
-
-<p>次の新しいドローアブル機能を使用してマテリアル デザイン アプリを実装できます。</p>
-
-<ul>
-<li><strong>ベクター型ドローアブル</strong>は定義を失わずにスケールできるので、単色のアプリ アイコンに最適です。
-</li>
-<li><strong>ドローアブルによる着色</strong>を使ってビットマップをアルファ マスクとして定義し、実行時にそのビットマップに色付けできます。
-</li>
-<li><strong>色の抽出</strong>を使ってビットマップ画像から代表色を自動的に抽出できます。
-</li>
-</ul>
-
-<p>詳細については、<a href="{@docRoot}training/material/drawables.html">ドローアブルの使用</a>をご覧ください。
-</p>
diff --git a/docs/html-intl/intl/ja/distribute/index.jd b/docs/html-intl/intl/ja/distribute/index-ja.jd
similarity index 100%
rename from docs/html-intl/intl/ja/distribute/index.jd
rename to docs/html-intl/intl/ja/distribute/index-ja.jd
diff --git a/docs/html-intl/intl/ja/index.jd b/docs/html-intl/intl/ja/index.jd
index fd81a213..6dfa0dd 100644
--- a/docs/html-intl/intl/ja/index.jd
+++ b/docs/html-intl/intl/ja/index.jd
@@ -5,6 +5,16 @@
 
 @jd:body
 
+<script>
+  $(document).ready(function() {
+    if (useUpdatedTemplates) {
+      $("#useUpdatedTemplates").css("display","block");
+    } else {
+      $("#useOldTemplates").css("display","block");
+    }
+  })
+</script>
+
 <!-- <div class="dac-hero-carousel" data-carousel-query="collection:index/carousel">
 </div> -->
 <section class="dac-hero-carousel">
@@ -39,11 +49,39 @@
 </a>
 </article></section>
 
-<div class="actions-bar dac-expand dac-invert">
+<div id="useUpdatedTemplates" style="display:none" class="dac-section dac-slim dac-gray dac-expand">
   <div class="wrap dac-offset-parent">
     <a class="dac-fab dac-scroll-button" data-scroll-button href="#build-apps">
       <i class="dac-sprite dac-arrow-down-gray"></i>
     </a>
+    <ul class="dac-actions">
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}sdk/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Get the SDK
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}samples/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Browse sample code
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}distribute/stories/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Watch stories
+        </a>
+      </li>
+    </ul>
+  </div><!-- end .wrap -->
+</div><!-- end .dac-actions -->
+
+<div id="useOldTemplates" style="display:none" class="actions-bar dac-expand dac-invert">
+  <div class="wrap dac-offset-parent">
+    <a class="dac-fab dac-scroll-button" data-scroll-button="" href="#build-apps">
+      <i class="dac-sprite dac-arrow-down-gray"></i>
+    </a>
     <div class="actions">
       <div><a href="{@docRoot}sdk/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
@@ -53,17 +91,15 @@
         <span class="dac-sprite dac-auto-chevron-large"></span>
         Browse Samples
       </a></div>
-      <div><a href="//www.youtube.com/user/androiddevelopers">
+      <div><a href="{@docRoot}distribute/stories/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
-        Watch Videos
+        Watch Stories
       </a></div>
     </div><!-- end .actions -->
   </div><!-- end .wrap -->
-</div><!-- end .actions-bar -->
+</div>
 
-
-
-<section class="dac-section dac-section-light" id="build-apps"><div class="wrap">
+<section class="dac-section dac-light" id="build-apps"><div class="wrap">
   <h1 class="dac-section-title">Build Beautiful Apps</h1>
   <div class="dac-section-subtitle">
     Resources to get you started with designing and developing for Android.
diff --git a/docs/html-intl/intl/ja/sdk/index.jd b/docs/html-intl/intl/ja/sdk/index.jd
index e2ba62d..771894a 100644
--- a/docs/html-intl/intl/ja/sdk/index.jd
+++ b/docs/html-intl/intl/ja/sdk/index.jd
@@ -1,62 +1,14 @@
 page.title=Android Studio と SDK Tools のダウンロード
 page.tags=sdk, android studio
 page.template=sdk
+page.image=images/cards/android-studio_2x.png
 header.hide=1
 page.metaDescription=公式 Android IDE とデベロッパー ツールをダウンロードして、Android 版のモバイル端末、タブレット、ウェアラブル端末、TV などの端末向けのアプリをビルドする。
 
-studio.version=1.4.0.10
-
-studio.linux_bundle_download=android-studio-ide-141.2288178-linux.zip
-studio.linux_bundle_bytes=380821638
-studio.linux_bundle_checksum=137e3734f2e8e285bd7c1d2fae2e8548d0f164bd
-
-studio.mac_bundle_download=android-studio-ide-141.2288178-mac.dmg
-studio.mac_bundle_bytes=364624965
-studio.mac_bundle_checksum=27068d59d5a78717d31bdedd054082b5c50d3897
-
-studio.win_bundle_download=android-studio-ide-141.2288178-windows.zip
-studio.win_bundle_bytes=373492997
-studio.win_bundle_checksum=c0851dc9a506ba9f4c1379a3e9b4019c08478220
-
-
-studio.win_bundle_exe_download=android-studio-bundle-141.2288178-windows.exe
-studio.win_bundle_exe_bytes=1177811944
-studio.win_bundle_exe_checksum=a2f0141d35f8f0c24dad2ff390e7f6231c5f7625
-
-studio.win_notools_exe_download=android-studio-ide-141.2288178-windows.exe
-studio.win_notools_exe_bytes=348295968
-studio.win_notools_exe_checksum=82d0d9c78ec23834956f941a07821be347fcb7bf
-
-
-
-
-sdk.linux_download=android-sdk_r24.3.4-linux.tgz
-sdk.linux_bytes=309138331
-sdk.linux_checksum=fb293d7bca42e05580be56b1adc22055d46603dd
-
-sdk.mac_download=android-sdk_r24.3.4-macosx.zip
-sdk.mac_bytes=98340900
-sdk.mac_checksum=128f10fba668ea490cc94a08e505a48a608879b9
-
-sdk.win_download=android-sdk_r24.3.4-windows.zip
-sdk.win_bytes=187496897
-sdk.win_checksum=4a8718fb4a2bf2128d34b92f23ddd79fc65839e7
-
-
-sdk.win_installer=installer_r24.3.4-windows.exe
-sdk.win_installer_bytes=139477985
-sdk.win_installer_checksum=094dd45f98a31f839feae898b48f23704f2878dd
-
-
-
-
-
-
 @jd:body
 
 <style type="text/css">
   .offline {display:none;}
-  a.download-bundle-button {display:block;}
   h2.feature {
     padding-top:30px;
     margin-top:0;
@@ -64,20 +16,7 @@
   }
   .feature-blurb {
   margin:0px; font-size:16px; font-weight:300;
-  padding:40px 0 0 0;
-  }
-
-  .landing-button.green {
-    font-size:16px;
-    background-color:#90c653;
-    padding:8px 10px 10px;
-    margin:0;
-    width:206px;
-    text-align:center;
-  }
-
-  .landing-button.green:hover {
-    background-color:#85b84f;
+  padding-top:40px;
   }
 
   .landing-button .small {
@@ -95,8 +34,8 @@
     white-space: nowrap;
     text-indent: -10000px;
     font-size:0px;
-    background: url(../images/tools/studio-logo.png);
-    background-image: -webkit-image-set(url(../images/tools/studio-logo.png) 1x, url(../images/tools/studio-logo_2x.png) 2x);
+    background: url({@docRoot}images/tools/studio-logo.png);
+    background-image: -webkit-image-set(url({@docRoot}images/tools/studio-logo.png) 1x, url({@docRoot}images/tools/studio-logo_2x.png) 2x);
     background-size: 226px 78px;
   }
 
@@ -293,15 +232,15 @@
 <p style="font-size: 16px; color:#bbb; position: absolute;left: 297px; top: 5px; display: block;
 width: 400px;text-align: center;">公式 Android IDE</p>
 
-<ul style="font-size:12px">
+<ul style="font-size:12px;line-height:19px;">
 <li>Android Studio IDE</li>
 <li>Android SDK Tools</li>
 <li>Android 6.0(Marshmallow)プラットフォーム</li>
 <li>Google API を使用した Android 6.0 エミュレータのシステム イメージ</li>
 </ul>
 
-
-<a class="online landing-button green download-bundle-button" style="margin-top:30px;" href="#Other">Download</a>
+<a class="online landing-button green download-bundle-button"
+href="#Other" >Download Android Studio<br/><span class='small'></span></a>
 
 <!-- this appears when viewing the offline docs -->
 <p class="offline">
@@ -397,8 +336,6 @@
   <p>APK は Android Studio でもコマンドラインでもビルドできます。</p>
 </div>
 
-</div>
-
 
 
 <h2 class="feature norule">Android Studio のその他の特徴</h2>
diff --git a/docs/html-intl/intl/ja/sdk/installing/adding-packages.jd b/docs/html-intl/intl/ja/sdk/installing/adding-packages.jd
index 7715eed..af5dcd0 100644
--- a/docs/html-intl/intl/ja/sdk/installing/adding-packages.jd
+++ b/docs/html-intl/intl/ja/sdk/installing/adding-packages.jd
@@ -31,7 +31,7 @@
   line-height:20px;
   padding:0 0 0 20px;
   margin:0 0 20px 0;
-  display:inline-block;
+  display:inline;
   font-weight:normal;
 }
 ol.large > li:nth-child(1):before {
diff --git a/docs/html-intl/intl/ko/design/index.jd b/docs/html-intl/intl/ko/design/index.jd
deleted file mode 100644
index b24c668..0000000
--- a/docs/html-intl/intl/ko/design/index.jd
+++ /dev/null
@@ -1,186 +0,0 @@
-page.title=Android용 머티리얼 디자인
-page.tags=Material,design
-page.type=design
-page.image=images/cards/design-material-for-android_2x.jpg
-
-@jd:body
-
-<!-- developer docs box -->
-<a class="notice-developers right" href="{@docRoot}training/material/index.html">
-  <div>
-    <h3>개발자 문서</h3>
-    <p>머티리얼 디자인으로 앱 생성</p>
-  </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=p4gmvHyuZzw">
-<div>
-    <h3>비디오</h3>
-    <p>머티리얼 디자인 소개</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=YaG_ljfzeUw">
-<div>
-    <h3>비디오</h3>
-    <p>종이와 잉크: 중요한 머티리얼</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=XOcCOBe8PTc">
-<div>
-    <h3>비디오</h3>
-    <p>Google I/O 앱 내 머티리얼 디자인</p>
-</div>
-</a>
-
-
-
-<p itemprop="description">머티리얼 디자인은 플랫폼 및 기기 전반의 표현 방식, 모션 및
-상호 작용 디자인에 대한 종합적인 지침입니다. Android에는 이제
-머티리얼 디자인 앱에 대한 지원이 포함되었습니다. Android 앱에서 머티리얼 디자인을 사용하려면 <a href="http://www.google.com/design/spec">머티리얼 디자인 사양</a>에
-규정되어 있는 지침을 따르세요. 또한 Android 5.0(API 레벨 21) 이상에서 제공하는
-새 구성 요소 및 기능을 사용하세요.</p>
-
-<p>Android는 머티리얼 디자인 앱을 구축하는 데 사용할 수 있는 다음 요소를 제공합니다.</p>
-
-<ul>
-  <li>새로운 테마</li>
-  <li>복잡한 뷰를 위한 새로운 위젯</li>
-  <li>사용자 지정 그림자 및 애니메이션을 위한 새로운 API</li>
-</ul>
-
-<p>Android에서 머티리얼 디자인을 구현하는 방법에 대한 자세한 내용은
-<a href="{@docRoot}training/material/index.html">머티리얼 디자인으로 앱 생성</a>을 참조하세요.</p>
-
-
-<h3>머티리얼 테마</h3>
-
-<p>머티리얼 테마는 앱에 사용할 수 있는 새로운 스타일, 색상표를
-설정할 수 있는 시스템 위젯, 그리고 터치 피드백 및 액티비티 전환을 위한 기본 애니메이션을 제공합니다.</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/MaterialDark.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">어두운 머티리얼 테마</p>
-  </div>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/MaterialLight.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">밝은 머티리얼 테마</p>
-  </div>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>자세한 내용은 <a href="{@docRoot}training/material/theme.html">머티리얼
-테마 사용</a>을 참조하세요.</p>
-
-
-<h3>목록 및 카드</h3>
-
-<p>Android는 머티리얼 디자인 스타일
-및 애니메이션으로 카드 및 목록을 표시하는 데 사용할 수 있는 두 개의 새로운 위젯을 제공합니다.</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/list_mail.png" width="500" height="426" />
-  <p>새로운 <code>RecyclerView</code> 위젯은 <code>ListView</code>의
-플러그 기능이 개선된 버전으로, 다양한 레이아웃 유형을 지원하고 향상된 성능을 제공합니다.</p>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/card_travel.png" width="500" height="426" />
-  <p>새로운 <code>CardView</code> 위젯은 일관적인 모양 및 느낌이 있는
-카드 내 정보의 중요한 부분을 표시할 수 있게 해줍니다.</p>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>자세한 내용은 <a href="{@docRoot}training/material/lists-cards.html">목록
-및 카드 생성</a>을 참조하세요.</p>
-
-
-<h3>뷰 그림자</h3>
-
-<p>X 및 Y 속성과 더불어 이제 Android의 뷰에는 Z
-속성이 추가되었습니다. 이 새로운 속성은 다음을 결정하는 뷰의 엘리베이션을 나타냅니다.</p>
-
-<ul>
-<li>그림자 크기: 뷰의 Z 값이 클수록 표시되는 그림자도 커집니다.</li>
-<li>그리기 순서: 뷰의 Z 값이 클수록 다른 뷰의 위에 표시됩니다.</li>
-</ul>
-
-<div style="width:290px;margin-left:35px;float:right">
-  <div class="framed-nexus5-port-span-5">
-  <video class="play-on-hover" autoplay>
-    <source src="{@docRoot}design/material/videos/ContactsAnim.mp4"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.webm"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.ogv"/>
-  </video>
-  </div>
-  <div style="font-size:10pt;margin-left:20px;margin-bottom:30px">
-    <em>영화를 재생하려면 기기 화면을 클릭하세요.</em>
-  </div>
-</div>
-
-<p>자세한 내용은 <a href="{@docRoot}training/material/shadows-clipping.html">그림자
-정의 및 뷰 클리핑</a>을 참조하세요.</p>
-
-
-<h3>애니메이션</h3>
-
-<p>새 애니메이션 API는 UI 컨트롤 내의 터치 피드백, 뷰 상태
-변화, 그리고 액티비티 전환을 위한 사용자 지정 애니메이션을 생성할 수 있게 해줍니다.</p>
-
-<p>이 API를 사용하면 다음 작업을 수행할 수 있습니다.</p>
-
-<ul>
-<li style="margin-bottom:15px">
-<strong>터치 피드백</strong> 애니메이션으로 뷰 내 터치 이벤트에 응답하기.
-</li>
-<li style="margin-bottom:15px">
-<strong>회전하며 나타나기</strong> 애니메이션으로 뷰 감추기 및 표시하기.
-</li>
-<li style="margin-bottom:15px">
-사용자 지정 <strong>액티비티 전환</strong> 애니메이션으로 액티비티 간 전환하기.
-</li>
-<li style="margin-bottom:15px">
-<strong>커브 모션</strong>으로 더 자연스러운 애니메이션 생성하기.
-</li>
-<li style="margin-bottom:15px">
-<strong>뷰 상태 변경</strong> 애니메이션으로 하나 이상의 뷰 속성 변경 사항 애니메이션화하기.
-</li>
-<li style="margin-bottom:15px">
-뷰 상태 변경 간에 <strong>상태 목록 드로어블</strong>에서 애니메이션 표시하기.
-</li>
-</ul>
-
-<p>터치 피드백 애니메이션은 버튼과 같은 여러 기본 뷰에 내장되어 있습니다. 새 API를 사용하면 이러한 애니메이션을 사용자 지정하고 사용자 지정 뷰에 추가할 수
-있습니다.</p>
-
-<p>자세한 내용은 <a href="{@docRoot}training/material/animations.html">사용자지정
-애니메이션 정의</a>를 참조하세요.</p>
-
-
-<h3>드로어블</h3>
-
-<p>드로어블에 대한 다음과 같은 새 기능을 통해 머티리얼 디자인 앱을 쉽게 구현할 수 있습니다.</p>
-
-<ul>
-<li><strong>벡터 드로어블</strong>은 단색 인앱 아이콘에
-적합하며, 정의 손실 없이 확장 가능합니다.</li>
-<li><strong>드로어블 색조</strong>를 사용하면 비트맵을 알파 마스크로 정의할 수 있으며, 런타임에
-색을 입힐 수 있습니다.</li>
-<li><strong>색상 추출</strong>은
-비트맵 이미지에서 주요 색상을 자동으로 추출할 수 있게 해줍니다.</li>
-</ul>
-
-<p>자세한 내용은 <a href="{@docRoot}training/material/drawables.html">드로어블
-사용</a>을 참조하세요.</p>
diff --git a/docs/html-intl/intl/ko/design/material/index.jd b/docs/html-intl/intl/ko/design/material/index.jd
index 61421d5d..b24c668 100644
--- a/docs/html-intl/intl/ko/design/material/index.jd
+++ b/docs/html-intl/intl/ko/design/material/index.jd
@@ -40,11 +40,7 @@
 
 
 <p itemprop="description">머티리얼 디자인은 플랫폼 및 기기 전반의 표현 방식, 모션 및
-<<<<<<< HEAD
 상호 작용 디자인에 대한 종합적인 지침입니다. Android에는 이제
-=======
-상호 작용 디자인에 대한 종합적인 지침입니다. Android에 이제
->>>>>>> Docs: L10N update for design documentation
 머티리얼 디자인 앱에 대한 지원이 포함되었습니다. Android 앱에서 머티리얼 디자인을 사용하려면 <a href="http://www.google.com/design/spec">머티리얼 디자인 사양</a>에
 규정되어 있는 지침을 따르세요. 또한 Android 5.0(API 레벨 21) 이상에서 제공하는
 새 구성 요소 및 기능을 사용하세요.</p>
diff --git a/docs/html-intl/intl/ko/distribute/index.jd b/docs/html-intl/intl/ko/distribute/index-ko.jd
similarity index 100%
rename from docs/html-intl/intl/ko/distribute/index.jd
rename to docs/html-intl/intl/ko/distribute/index-ko.jd
diff --git a/docs/html-intl/intl/ko/index.jd b/docs/html-intl/intl/ko/index.jd
index d3d0748..8b1bfbc 100644
--- a/docs/html-intl/intl/ko/index.jd
+++ b/docs/html-intl/intl/ko/index.jd
@@ -5,6 +5,16 @@
 
 @jd:body
 
+<script>
+  $(document).ready(function() {
+    if (useUpdatedTemplates) {
+      $("#useUpdatedTemplates").css("display","block");
+    } else {
+      $("#useOldTemplates").css("display","block");
+    }
+  })
+</script>
+
 <!-- <div class="dac-hero-carousel" data-carousel-query="collection:index/carousel">
 </div> -->
 <section class="dac-hero-carousel">
@@ -39,11 +49,39 @@
 </a>
 </article></section>
 
-<div class="actions-bar dac-expand dac-invert">
+<div id="useUpdatedTemplates" style="display:none" class="dac-section dac-slim dac-gray dac-expand">
   <div class="wrap dac-offset-parent">
     <a class="dac-fab dac-scroll-button" data-scroll-button href="#build-apps">
       <i class="dac-sprite dac-arrow-down-gray"></i>
     </a>
+    <ul class="dac-actions">
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}sdk/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Get the SDK
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}samples/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Browse sample code
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}distribute/stories/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Watch stories
+        </a>
+      </li>
+    </ul>
+  </div><!-- end .wrap -->
+</div><!-- end .dac-actions -->
+
+<div id="useOldTemplates" style="display:none" class="actions-bar dac-expand dac-invert">
+  <div class="wrap dac-offset-parent">
+    <a class="dac-fab dac-scroll-button" data-scroll-button="" href="#build-apps">
+      <i class="dac-sprite dac-arrow-down-gray"></i>
+    </a>
     <div class="actions">
       <div><a href="{@docRoot}sdk/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
@@ -53,17 +91,15 @@
         <span class="dac-sprite dac-auto-chevron-large"></span>
         Browse Samples
       </a></div>
-      <div><a href="//www.youtube.com/user/androiddevelopers">
+      <div><a href="{@docRoot}distribute/stories/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
-        Watch Videos
+        Watch Stories
       </a></div>
     </div><!-- end .actions -->
   </div><!-- end .wrap -->
-</div><!-- end .actions-bar -->
+</div>
 
-
-
-<section class="dac-section dac-section-light" id="build-apps"><div class="wrap">
+<section class="dac-section dac-light" id="build-apps"><div class="wrap">
   <h1 class="dac-section-title">Build Beautiful Apps</h1>
   <div class="dac-section-subtitle">
     Resources to get you started with designing and developing for Android.
diff --git a/docs/html-intl/intl/ko/sdk/index.jd b/docs/html-intl/intl/ko/sdk/index.jd
index 9797302..f4728c3 100644
--- a/docs/html-intl/intl/ko/sdk/index.jd
+++ b/docs/html-intl/intl/ko/sdk/index.jd
@@ -1,62 +1,14 @@
 page.title=Android Studio 및 SDK 도구 다운로드
 page.tags=sdk, android studio
 page.template=sdk
+page.image=images/cards/android-studio_2x.png
 header.hide=1
 page.metaDescription=Android 휴대폰, 태블릿, 웨어러블, TV 등을 위한 앱을 구축하는 데 사용할 수 있는 공식 Android IDE 및 개발자 도구를 다운로드하세요.
 
-studio.version=1.4.0.10
-
-studio.linux_bundle_download=android-studio-ide-141.2288178-linux.zip
-studio.linux_bundle_bytes=380821638
-studio.linux_bundle_checksum=137e3734f2e8e285bd7c1d2fae2e8548d0f164bd
-
-studio.mac_bundle_download=android-studio-ide-141.2288178-mac.dmg
-studio.mac_bundle_bytes=364624965
-studio.mac_bundle_checksum=27068d59d5a78717d31bdedd054082b5c50d3897
-
-studio.win_bundle_download=android-studio-ide-141.2288178-windows.zip
-studio.win_bundle_bytes=373492997
-studio.win_bundle_checksum=c0851dc9a506ba9f4c1379a3e9b4019c08478220
-
-
-studio.win_bundle_exe_download=android-studio-bundle-141.2288178-windows.exe
-studio.win_bundle_exe_bytes=1177811944
-studio.win_bundle_exe_checksum=a2f0141d35f8f0c24dad2ff390e7f6231c5f7625
-
-studio.win_notools_exe_download=android-studio-ide-141.2288178-windows.exe
-studio.win_notools_exe_bytes=348295968
-studio.win_notools_exe_checksum=82d0d9c78ec23834956f941a07821be347fcb7bf
-
-
-
-
-sdk.linux_download=android-sdk_r24.3.4-linux.tgz
-sdk.linux_bytes=309138331
-sdk.linux_checksum=fb293d7bca42e05580be56b1adc22055d46603dd
-
-sdk.mac_download=android-sdk_r24.3.4-macosx.zip
-sdk.mac_bytes=98340900
-sdk.mac_checksum=128f10fba668ea490cc94a08e505a48a608879b9
-
-sdk.win_download=android-sdk_r24.3.4-windows.zip
-sdk.win_bytes=187496897
-sdk.win_checksum=4a8718fb4a2bf2128d34b92f23ddd79fc65839e7
-
-
-sdk.win_installer=installer_r24.3.4-windows.exe
-sdk.win_installer_bytes=139477985
-sdk.win_installer_checksum=094dd45f98a31f839feae898b48f23704f2878dd
-
-
-
-
-
-
 @jd:body
 
 <style type="text/css">
   .offline {display:none;}
-  a.download-bundle-button {display:block;}
   h2.feature {
     padding-top:30px;
     margin-top:0;
@@ -64,20 +16,7 @@
   }
   .feature-blurb {
   margin:0px; font-size:16px; font-weight:300;
-  padding:40px 0 0 0;
-  }
-
-  .landing-button.green {
-    font-size:16px;
-    background-color:#90c653;
-    padding:8px 10px 10px;
-    margin:0;
-    width:206px;
-    text-align:center;
-  }
-
-  .landing-button.green:hover {
-    background-color:#85b84f;
+  padding-top:40px;
   }
 
   .landing-button .small {
@@ -95,8 +34,8 @@
     white-space: nowrap;
     text-indent: -10000px;
     font-size:0px;
-    background: url(../images/tools/studio-logo.png);
-    background-image: -webkit-image-set(url(../images/tools/studio-logo.png) 1x, url(../images/tools/studio-logo_2x.png) 2x);
+    background: url({@docRoot}images/tools/studio-logo.png);
+    background-image: -webkit-image-set(url({@docRoot}images/tools/studio-logo.png) 1x, url({@docRoot}images/tools/studio-logo_2x.png) 2x);
     background-size: 226px 78px;
   }
 
@@ -292,15 +231,15 @@
 <p style="font-size: 16px; color:#bbb; position: absolute;left: 297px; top: 5px; display: block;
 width: 400px;text-align: center;">공식 Android IDE</p>
 
-<ul style="font-size:12px">
+<ul style="font-size:12px;line-height:19px;">
 <li>Android Studio IDE</li>
 <li>Android SDK Tools</li>
 <li>Android 6.0(Marshmallow) 플랫폼</li>
 <li>Google API를 사용하는 Android 6.0 에뮬레이터 시스템 이미지</li>
 </ul>
 
-
-<a class="online landing-button green download-bundle-button" style="margin-top:30px;" href="#Other">Download</a>
+<a class="online landing-button green download-bundle-button"
+href="#Other" >Download Android Studio<br/><span class='small'></span></a>
 
 <!-- this appears when viewing the offline docs -->
 <p class="offline">
diff --git a/docs/html-intl/intl/ko/sdk/installing/adding-packages.jd b/docs/html-intl/intl/ko/sdk/installing/adding-packages.jd
index b70d39e..b935d87 100644
--- a/docs/html-intl/intl/ko/sdk/installing/adding-packages.jd
+++ b/docs/html-intl/intl/ko/sdk/installing/adding-packages.jd
@@ -1,7 +1,6 @@
 page.title=SDK 패키지 추가하기
 
 page.tags=sdk manager
-helpoutsWidget=true
 
 @jd:body
 
@@ -31,7 +30,7 @@
   line-height:20px;
   padding:0 0 0 20px;
   margin:0 0 20px 0;
-  display:inline-block;
+  display:inline;
   font-weight:normal;
 }
 ol.large > li:nth-child(1):before {
diff --git a/docs/html-intl/intl/pt-br/design/index.jd b/docs/html-intl/intl/pt-br/design/index.jd
deleted file mode 100644
index 5368d2d..0000000
--- a/docs/html-intl/intl/pt-br/design/index.jd
+++ /dev/null
@@ -1,186 +0,0 @@
-page.title=Material Design para Android
-page.tags=Material,design
-page.type=design
-page.image=images/cards/design-material-for-android_2x.jpg
-
-@jd:body
-
-<!-- developer docs box -->
-<a class="notice-developers right" href="{@docRoot}training/material/index.html">
-  <div>
-    <h3>Documentos do desenvolvedor</h3>
-    <p>Criação de aplicativos com o Material Design</p>
-  </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=p4gmvHyuZzw">
-<div>
-    <h3>Vídeo</h3>
-    <p>Introdução ao Material Design</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=YaG_ljfzeUw">
-<div>
-    <h3>Vídeo</h3>
-    <p>Papel e tinta: Os materiais que importam</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=XOcCOBe8PTc">
-<div>
-    <h3>Vídeo</h3>
-    <p>Material Design no aplicativo Google I/O</p>
-</div>
-</a>
-
-
-
-<p itemprop="description">O Material Design é um guia abrangente para design visual, de movimento e de 
-interação para diversas plataformas e dispositivos. O Android agora é compatível com
-aplicativos do Material Design. Para usar o Material Design nos aplicativos Android, siga as orientações definidas 
-nas <a href="http://www.google.com/design/spec">especificações do Material Design</a> e use os novos 
-componentes e funcionalidades disponíveis no Android 5.0 (API de nível 21) e em posteriores.</p>
-
-<p>O Android fornece os seguintes elementos para criar aplicativos do Material Design:</p>
-
-<ul>
-  <li>Um novo tema</li>
-  <li>Novos widgets para vistas complexas</li>
-  <li>Novas APIs para sombras e animações personalizadas</li>
-</ul>
-
-<p>Para obter mais informações sobre a implementação do Material Design no Android, consulte
-<a href="{@docRoot}training/material/index.html">Criação de aplicativos com o Material Design</a>.</p>
-
-
-<h3>Tema do Material</h3>
-
-<p>O tema do Material fornece um novo estilo para o seu aplicativo, widgets de sistema que permitem 
-definir a paleta de cores e as animações padrão para feedback de toque e transições de atividades.</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/MaterialDark.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">Tema escuro do Material</p>
-  </div>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/MaterialLight.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">Tema claro do Material</p>
-  </div>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>Para obter mais informações, consulte <a href="{@docRoot}training/material/theme.html">Como usar o tema 
-do Material</a>.</p>
-
-
-<h3>Listas e cartões</h3>
-
-<p>O Android fornece dois novos widgets para exibir cartões e listas com estilos e animações do 
-Material Design:</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/list_mail.png" width="500" height="426" />
-  <p>O novo widget <code>RecyclerView</code> é uma versão mais completa de <code>ListView</code>
- com suporte para diferentes tipos de layout e melhorias no desempenho.</p>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/card_travel.png" width="500" height="426" />
-  <p>O novo widget <code>CardView</code> permite exibir informações importantes dentro de 
-  cartões que têm aparência consistente.</p>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>Para obter mais informações, consulte <a href="{@docRoot}training/material/lists-cards.html">Como criar 
-listas e cartões</a>.</p>
-
-
-<h3>Sombras de vistas</h3>
-
-<p>Além das propriedades X e Y, vistas no Android agora têm uma propriedade 
-Z. Essa nova propriedade representa a elevação de uma vista, que determina:</p>
-
-<ul>
-<li>O tamanho da sombra: vistas com valores maiores de Z lançam sombras maiores.</li>
-<li>A ordem de desenho: vistas com valores maiores de Z aparecem sobre outras vistas.</li>
-</ul>
-
-<div style="width:290px;margin-left:35px;float:right">
-  <div class="framed-nexus5-port-span-5">
-  <video class="play-on-hover" autoplay>
-    <source src="{@docRoot}design/material/videos/ContactsAnim.mp4"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.webm"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.ogv"/>
-  </video>
-  </div>
-  <div style="font-size:10pt;margin-left:20px;margin-bottom:30px">
-    <em>Para reproduzir o filme, clique na tela do dispositivo</em>
-  </div>
-</div>
-
-<p>Para obter mais informações, consulte <a href="{@docRoot}training/material/shadows-clipping.html">Como 
-definir sombras e recortar visualizações</a>.</p>
-
-
-<h3>Animações</h3>
-
-<p>As novas APIs de animação permitem criar animações personalizadas para feedback de toque em controles de IU,
-mudanças no estado da vista e transições de atividades.</p>
-
-<p>Essas APIs permitem:</p>
-
-<ul>
-<li style="margin-bottom:15px">
-Responder a eventos de toque nas vistas com animações de <strong>feedback de toque</strong>.
-</li>
-<li style="margin-bottom:15px">
-Ocultar e exibir vistas com animações de <strong>revelação circular</strong>.
-</li>
-<li style="margin-bottom:15px">
-Alternar entre atividades com animações de <strong>transição de atividades</strong>.
-</li>
-<li style="margin-bottom:15px">
-Criar animações mais naturais com <strong>movimento curvado</strong>.
-</li>
-<li style="margin-bottom:15px">
-Animar mudanças em uma ou mais propriedades da vista com animações de <strong>mudança de estado da vista</strong>.
-</li>
-<li style="margin-bottom:15px">
-Exibir animações em <strong>desenháveis da lista de estado</strong> entre mudanças de estado da vista.
-</li>
-</ul>
-
-<p>Animações de feedback de toque são integradas em várias vistas padrão, como botões. As novas APIs
-permitem personalizar essas animações e adicioná-las às vistas personalizadas.</p>
-
-<p>Para obter mais informações, consulte <a href="{@docRoot}training/material/animations.html">Como definir 
-animações personalizadas</a>.</p>
-
-
-<h3>Desenháveis</h3>
-
-<p>Essas novas capacidades dos desenháveis ajudam na implementação de aplicativos do Material Design:</p>
-
-<ul>
-<li><strong>Desenháveis de vetor</strong> são dimensionáveis sem perder definição e são perfeitos
-para ícones de uma cor dentro do aplicativo.</li>
-<li><strong>Tingimento desenhável</strong> permite definir mapas de bits como uma máscara alfa e tingi-los com
-uma cor em tempo de execução.</li>
-<li><strong>Extração de cor</strong> permite extrair automaticamente cores proeminentes de uma
-imagem de mapa de bits.</li>
-</ul>
-
-<p>Para obter mais informações, consulte <a href="{@docRoot}training/material/drawables.html">Como trabalhar 
-com desenháveis</a>.</p>
diff --git a/docs/html-intl/intl/pt-br/design/material/index.jd b/docs/html-intl/intl/pt-br/design/material/index.jd
index 579bf93..5368d2d 100644
--- a/docs/html-intl/intl/pt-br/design/material/index.jd
+++ b/docs/html-intl/intl/pt-br/design/material/index.jd
@@ -39,11 +39,7 @@
 
 
 
-<<<<<<< HEAD
 <p itemprop="description">O Material Design é um guia abrangente para design visual, de movimento e de 
-=======
-<p itemprop="description">O Material Design é um guia abrangente para projeto visual, de movimento e de 
->>>>>>> Docs: L10N update for design documentation
 interação para diversas plataformas e dispositivos. O Android agora é compatível com
 aplicativos do Material Design. Para usar o Material Design nos aplicativos Android, siga as orientações definidas 
 nas <a href="http://www.google.com/design/spec">especificações do Material Design</a> e use os novos 
@@ -102,11 +98,7 @@
 <div style="float:left;width:250px;margin-right:0px;">
   <img src="{@docRoot}design/material/images/card_travel.png" width="500" height="426" />
   <p>O novo widget <code>CardView</code> permite exibir informações importantes dentro de 
-<<<<<<< HEAD
   cartões que têm aparência consistente.</p>
-=======
- cartões que têm aparência consistente.</p>
->>>>>>> Docs: L10N update for design documentation
 </div>
 <br style="clear:left"/>
 </div>
diff --git a/docs/html-intl/intl/pt-br/index.jd b/docs/html-intl/intl/pt-br/index.jd
index 2c2fdee..8605ab8 100644
--- a/docs/html-intl/intl/pt-br/index.jd
+++ b/docs/html-intl/intl/pt-br/index.jd
@@ -5,6 +5,16 @@
 
 @jd:body
 
+<script>
+  $(document).ready(function() {
+    if (useUpdatedTemplates) {
+      $("#useUpdatedTemplates").css("display","block");
+    } else {
+      $("#useOldTemplates").css("display","block");
+    }
+  })
+</script>
+
 <!-- <div class="dac-hero-carousel" data-carousel-query="collection:index/carousel">
 </div> -->
 <section class="dac-hero-carousel">
@@ -39,11 +49,39 @@
 </a>
 </article></section>
 
-<div class="actions-bar dac-expand dac-invert">
+<div id="useUpdatedTemplates" style="display:none" class="dac-section dac-slim dac-gray dac-expand">
   <div class="wrap dac-offset-parent">
     <a class="dac-fab dac-scroll-button" data-scroll-button href="#build-apps">
       <i class="dac-sprite dac-arrow-down-gray"></i>
     </a>
+    <ul class="dac-actions">
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}sdk/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Get the SDK
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}samples/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Browse sample code
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}distribute/stories/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Watch stories
+        </a>
+      </li>
+    </ul>
+  </div><!-- end .wrap -->
+</div><!-- end .dac-actions -->
+
+<div id="useOldTemplates" style="display:none" class="actions-bar dac-expand dac-invert">
+  <div class="wrap dac-offset-parent">
+    <a class="dac-fab dac-scroll-button" data-scroll-button="" href="#build-apps">
+      <i class="dac-sprite dac-arrow-down-gray"></i>
+    </a>
     <div class="actions">
       <div><a href="{@docRoot}sdk/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
@@ -53,17 +91,15 @@
         <span class="dac-sprite dac-auto-chevron-large"></span>
         Browse Samples
       </a></div>
-      <div><a href="//www.youtube.com/user/androiddevelopers">
+      <div><a href="{@docRoot}distribute/stories/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
-        Watch Videos
+        Watch Stories
       </a></div>
     </div><!-- end .actions -->
   </div><!-- end .wrap -->
-</div><!-- end .actions-bar -->
+</div>
 
-
-
-<section class="dac-section dac-section-light" id="build-apps"><div class="wrap">
+<section class="dac-section dac-light" id="build-apps"><div class="wrap">
   <h1 class="dac-section-title">Build Beautiful Apps</h1>
   <div class="dac-section-subtitle">
     Resources to get you started with designing and developing for Android.
diff --git a/docs/html-intl/intl/pt-br/sdk/index.jd b/docs/html-intl/intl/pt-br/sdk/index.jd
index 152bf26..ff3210b1 100644
--- a/docs/html-intl/intl/pt-br/sdk/index.jd
+++ b/docs/html-intl/intl/pt-br/sdk/index.jd
@@ -1,62 +1,14 @@
 page.title=Como baixar o Android Studio e o SDK Tools
 page.tags=sdk, android studio
 page.template=sdk
+page.image=images/cards/android-studio_2x.png
 header.hide=1
 page.metaDescription=Baixar o Android IDE e ferramentas do desenvolvedor para compilar aplicativos para celulares, tablets, dispositivos de uso junto ao corpo, TVs e muito mais do Android.
 
-studio.version=1.4.0.10
-
-studio.linux_bundle_download=android-studio-ide-141.2288178-linux.zip
-studio.linux_bundle_bytes=380821638
-studio.linux_bundle_checksum=137e3734f2e8e285bd7c1d2fae2e8548d0f164bd
-
-studio.mac_bundle_download=android-studio-ide-141.2288178-mac.dmg
-studio.mac_bundle_bytes=364624965
-studio.mac_bundle_checksum=27068d59d5a78717d31bdedd054082b5c50d3897
-
-studio.win_bundle_download=android-studio-ide-141.2288178-windows.zip
-studio.win_bundle_bytes=373492997
-studio.win_bundle_checksum=c0851dc9a506ba9f4c1379a3e9b4019c08478220
-
-
-studio.win_bundle_exe_download=android-studio-bundle-141.2288178-windows.exe
-studio.win_bundle_exe_bytes=1177811944
-studio.win_bundle_exe_checksum=a2f0141d35f8f0c24dad2ff390e7f6231c5f7625
-
-studio.win_notools_exe_download=android-studio-ide-141.2288178-windows.exe
-studio.win_notools_exe_bytes=348295968
-studio.win_notools_exe_checksum=82d0d9c78ec23834956f941a07821be347fcb7bf
-
-
-
-
-sdk.linux_download=android-sdk_r24.3.4-linux.tgz
-sdk.linux_bytes=309138331
-sdk.linux_checksum=fb293d7bca42e05580be56b1adc22055d46603dd
-
-sdk.mac_download=android-sdk_r24.3.4-macosx.zip
-sdk.mac_bytes=98340900
-sdk.mac_checksum=128f10fba668ea490cc94a08e505a48a608879b9
-
-sdk.win_download=android-sdk_r24.3.4-windows.zip
-sdk.win_bytes=187496897
-sdk.win_checksum=4a8718fb4a2bf2128d34b92f23ddd79fc65839e7
-
-
-sdk.win_installer=installer_r24.3.4-windows.exe
-sdk.win_installer_bytes=139477985
-sdk.win_installer_checksum=094dd45f98a31f839feae898b48f23704f2878dd
-
-
-
-
-
-
 @jd:body
 
 <style type="text/css">
   .offline {display:none;}
-  a.download-bundle-button {display:block;}
   h2.feature {
     padding-top:30px;
     margin-top:0;
@@ -64,20 +16,7 @@
   }
   .feature-blurb {
   margin:0px; font-size:16px; font-weight:300;
-  padding:40px 0 0 0;
-  }
-
-  .landing-button.green {
-    font-size:16px;
-    background-color:#90c653;
-    padding:8px 10px 10px;
-    margin:0;
-    width:206px;
-    text-align:center;
-  }
-
-  .landing-button.green:hover {
-    background-color:#85b84f;
+  padding-top:40px;
   }
 
   .landing-button .small {
@@ -95,8 +34,8 @@
     white-space: nowrap;
     text-indent: -10000px;
     font-size:0px;
-    background: url(../images/tools/studio-logo.png);
-    background-image: -webkit-image-set(url(../images/tools/studio-logo.png) 1x, url(../images/tools/studio-logo_2x.png) 2x);
+    background: url({@docRoot}images/tools/studio-logo.png);
+    background-image: -webkit-image-set(url({@docRoot}images/tools/studio-logo.png) 1x, url({@docRoot}images/tools/studio-logo_2x.png) 2x);
     background-size: 226px 78px;
   }
 
@@ -292,7 +231,7 @@
 <p style="font-size: 16px; color:#bbb; position: absolute;left: 297px; top: 5px; display: block;
 width: 400px;text-align: center;">O IDE oficial do Android</p>
 
-<ul style="font-size:12px">
+<ul style="font-size:12px;line-height:19px;">
 <li>IDE do Android Studio</li>
 <li>Ferramentas do Android SDK</li>
 <li>Plataforma do Android 6.0 (Marshmallow)</li>
@@ -300,7 +239,8 @@
 </ul>
 
 
-<a class="online landing-button green download-bundle-button" style="margin-top:30px;" href="#Other">Download</a>
+<a class="online landing-button green download-bundle-button"
+href="#Other" >Download Android Studio<br/><span class='small'></span></a>
 
 <!-- this appears when viewing the offline docs -->
 <p class="offline">
diff --git a/docs/html-intl/intl/pt-br/sdk/installing/adding-packages.jd b/docs/html-intl/intl/pt-br/sdk/installing/adding-packages.jd
index f7022a4..bda33b6 100644
--- a/docs/html-intl/intl/pt-br/sdk/installing/adding-packages.jd
+++ b/docs/html-intl/intl/pt-br/sdk/installing/adding-packages.jd
@@ -1,7 +1,6 @@
 page.title=Como adicionar pacotes SDK
 
 page.tags=sdk manager
-helpoutsWidget=true
 
 @jd:body
 
@@ -31,7 +30,7 @@
   line-height:20px;
   padding:0 0 0 20px;
   margin:0 0 20px 0;
-  display:inline-block;
+  display:inline;
   font-weight:normal;
 }
 ol.large > li:nth-child(1):before {
diff --git a/docs/html-intl/intl/ru/design/index.jd b/docs/html-intl/intl/ru/design/index.jd
deleted file mode 100644
index da0352a..0000000
--- a/docs/html-intl/intl/ru/design/index.jd
+++ /dev/null
@@ -1,186 +0,0 @@
-page.title=Material Design для Android
-page.tags=Material,design
-page.type=разработка
-page.image=images/cards/design-material-for-android_2x.jpg
-
-@jd:body
-
-<!-- developer docs box -->
-<a class="notice-developers right" href="{@docRoot}training/material/index.html">
-  <div>
-    <h3>Документация для разработчиков</h3>
-    <p>Создание приложений с помощью Material Design</p>
-  </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=p4gmvHyuZzw">
-<div>
-    <h3>Видеоролик</h3>
-    <p>Введение в Material Design</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=YaG_ljfzeUw">
-<div>
-    <h3>Видеоролик</h3>
-    <p>Бумага и чернила: материалы, имеющие первостепенное значение</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=XOcCOBe8PTc">
-<div>
-    <h3>Видеоролик</h3>
-    <p>Material Design в приложениях для конференции Google I/O</p>
-</div>
-</a>
-
-
-
-<p itemprop="description">Material Design представляет собой комплексную концепцию создания визуальных, движущихся и
- интерактивных элементов для различных платформ и устройств. Теперь Android включает в себя поддержку
-приложений с элементами Material Design. Чтобы использовать элементы Material Design в своих приложениях под Android, руководствуйтесь инструкциями
-в <a href="http://www.google.com/design/spec">спецификации Material Design</a>, а также воспользуйтесь
-новыми компонентами и функциями, доступными в Android 5.0 (уровень API 21) и выше.</p>
-
-<p>Android предоставляет следующие элементы для построения приложений в соответствии с концепцией Material Design:</p>
-
-<ul>
-  <li>новую тему;</li>
-  <li>новые виджеты для сложных представлений;</li>
-  <li>новые API-интерфейсы для нестандартных теней и анимаций.</li>
-</ul>
-
-<p>Дополнительные сведения о реализации Material Design в Android см. в разделе
-<a href="{@docRoot}training/material/index.html">Создание приложений с помощью Material Design</a>.</p>
-
-
-<h3>Тема Material Design</h3>
-
-<p>Тема Material Design предоставляет новый стиль для ваших приложений, системные виджеты, для которых можно настраивать
-цветовую палитру, и анимации, выполняемые по умолчанию в качестве реакции на касание и при переходах между действиями.</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/MaterialDark.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">Тема Material Design в темных тонах</p>
-  </div>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/MaterialLight.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">Тема Material Design в светлых тонах</p>
-  </div>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>Дополнительные сведения см. в разделе <a href="{@docRoot}training/material/theme.html">Использование темы
-Material Design</a>.</p>
-
-
-<h3>Списки и подсказки</h3>
-
-<p>Android предоставляет два новых виджета для отображения подсказок и списков с использованием стилей
-и анимаций Material Design:</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/list_mail.png" width="500" height="426" />
-  <p>Виджет <code>RecyclerView</code> представляет собой более гибкую версию <code>ListView</code>,
-которая поддерживает различные типы макетов и способствует повышению производительности.</p>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/card_travel.png" width="500" height="426" />
-  <p>Виджет <code>CardView</code> позволяет отображать важные элементы информации внутри
-  подсказок, имеющие согласованный внешний вид и поведение.</p>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>Дополнительные сведения см. в разделе <a href="{@docRoot}training/material/lists-cards.html">Создание списков
-и подсказок</a>.</p>
-
-
-<h3>Тени представлений</h3>
-
-<p>Теперь, помимо свойств X и Y, представления в Android имеют свойство
-Z. Это новое свойство показывает, насколько представление "приподнято", иными словами, определяет</p>
-
-<ul>
-<li>размер тени: чем больше Z, тем больше тени, отбрасываемые представлением;</li>
-<li>порядок рисования: представления с более высокими значениями Z отображаются поверх других.</li>
-</ul>
-
-<div style="width:290px;margin-left:35px;float:right">
-  <div class="framed-nexus5-port-span-5">
-  <video class="play-on-hover" autoplay>
-    <source src="{@docRoot}design/material/videos/ContactsAnim.mp4"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.webm"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.ogv"/>
-  </video>
-  </div>
-  <div style="font-size:10pt;margin-left:20px;margin-bottom:30px">
-    <em>Для воспроизведения фильма нажмите на экран устройства</em>
-  </div>
-</div>
-
-<p>Дополнительные сведения см. в разделе <a href="{@docRoot}training/material/shadows-clipping.html">Определение
-теней и обрезка представлений</a>.</p>
-
-
-<h3>Анимация</h3>
-
-<p>Новые API-интерфейсы анимации позволяют создавать нестандартную анимацию для реакции на касание в элементах пользовательского интерфейса,
-изменения состояния представления и переходов между действиями.</p>
-
-<p>Эти API-интерфейсы позволяют:</p>
-
-<ul>
-<li style="margin-bottom:15px">
-реагировать на касание в представлениях, используя анимацию для <strong>реакции на касание</strong>;
-</li>
-<li style="margin-bottom:15px">
-скрывать и отображать представление с помощью анимации для <strong>кругового появления</strong>;
-</li>
-<li style="margin-bottom:15px">
-переключаться между действиями с помощью настраиваемой анимации для <strong>переходов между действиями</strong>;
-</li>
-<li style="margin-bottom:15px">
-создавать более естественное движение с помощью анимации для <strong>перемещения по кривой</strong>;
-</li>
-<li style="margin-bottom:15px">
-анимировать изменение одного или нескольких свойств представления с помощью анимации для <strong>изменения состояния представления</strong>;
-</li>
-<li style="margin-bottom:15px">
-отображать анимацию в <strong>графических элементах списков состояний</strong> в промежутке между изменением состояний представления.
-</li>
-</ul>
-
-<p>Анимация для реакции на касание встроена в некоторые стандартные представления, например кнопки. Новые API-интерфейсы
-позволяют разработчику настраивать эти анимации и добавлять их в свои нестандартные представления.</p>
-
-<p>Дополнительные сведения см. в разделе <a href="{@docRoot}training/material/animations.html">Определение настраиваемой 
-анимации</a>.</p>
-
-
-<h3>Графические объекты</h3>
-
-<p>Следующие возможности по работе с графическими объектами облегчают реализацию приложений с элементами Material Design:</p>
-
-<ul>
-<li><strong>векторные объекты</strong> можно масштабировать без ущерба для четкости, и они отлично подходят
-в качестве одноцветных значков приложения;</li>
-<li><strong>тонирование графических объектов</strong> позволяет определять растровые изображения как альфа-маску и тонировать их
-нужным цветом во время выполнения;</li>
-<li><strong>извлечение цвета</strong> позволяет автоматически извлекать главные цвета из
-растровых изображений.</li>
-</ul>
-
-<p>Дополнительные сведения см. в разделе <a href="{@docRoot}training/material/drawables.html">Работа с 
-элементами дизайна</a>.</p>
diff --git a/docs/html-intl/intl/ru/design/material/index.jd b/docs/html-intl/intl/ru/design/material/index.jd
index a548d3a..da0352a 100644
--- a/docs/html-intl/intl/ru/design/material/index.jd
+++ b/docs/html-intl/intl/ru/design/material/index.jd
@@ -162,17 +162,10 @@
 </li>
 </ul>
 
-<<<<<<< HEAD
 <p>Анимация для реакции на касание встроена в некоторые стандартные представления, например кнопки. Новые API-интерфейсы
 позволяют разработчику настраивать эти анимации и добавлять их в свои нестандартные представления.</p>
 
 <p>Дополнительные сведения см. в разделе <a href="{@docRoot}training/material/animations.html">Определение настраиваемой 
-=======
-<p>Анимация для реакции на касание встроена в некоторые стандартные представления, например, кнопки. Новые API-интерфейсы
-позволяют разработчику настраивать эти анимации и добавлять их в свои нестандартные представления.</p>
-
-<p>Дополнительные сведения, см. в разделе <a href="{@docRoot}training/material/animations.html">Определение настраиваемой 
->>>>>>> Docs: L10N update for design documentation
 анимации</a>.</p>
 
 
diff --git a/docs/html-intl/intl/ru/index.jd b/docs/html-intl/intl/ru/index.jd
index 8ce4b02..7faaac0 100644
--- a/docs/html-intl/intl/ru/index.jd
+++ b/docs/html-intl/intl/ru/index.jd
@@ -5,6 +5,16 @@
 
 @jd:body
 
+<script>
+  $(document).ready(function() {
+    if (useUpdatedTemplates) {
+      $("#useUpdatedTemplates").css("display","block");
+    } else {
+      $("#useOldTemplates").css("display","block");
+    }
+  })
+</script>
+
 <!-- <div class="dac-hero-carousel" data-carousel-query="collection:index/carousel">
 </div> -->
 <section class="dac-hero-carousel">
@@ -39,11 +49,39 @@
 </a>
 </article></section>
 
-<div class="actions-bar dac-expand dac-invert">
+<div id="useUpdatedTemplates" style="display:none" class="dac-section dac-slim dac-gray dac-expand">
   <div class="wrap dac-offset-parent">
     <a class="dac-fab dac-scroll-button" data-scroll-button href="#build-apps">
       <i class="dac-sprite dac-arrow-down-gray"></i>
     </a>
+    <ul class="dac-actions">
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}sdk/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Get the SDK
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}samples/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Browse sample code
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}distribute/stories/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Watch stories
+        </a>
+      </li>
+    </ul>
+  </div><!-- end .wrap -->
+</div><!-- end .dac-actions -->
+
+<div id="useOldTemplates" style="display:none" class="actions-bar dac-expand dac-invert">
+  <div class="wrap dac-offset-parent">
+    <a class="dac-fab dac-scroll-button" data-scroll-button="" href="#build-apps">
+      <i class="dac-sprite dac-arrow-down-gray"></i>
+    </a>
     <div class="actions">
       <div><a href="{@docRoot}sdk/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
@@ -53,17 +91,15 @@
         <span class="dac-sprite dac-auto-chevron-large"></span>
         Browse Samples
       </a></div>
-      <div><a href="//www.youtube.com/user/androiddevelopers">
+      <div><a href="{@docRoot}distribute/stories/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
-        Watch Videos
+        Watch Stories
       </a></div>
     </div><!-- end .actions -->
   </div><!-- end .wrap -->
-</div><!-- end .actions-bar -->
+</div>
 
-
-
-<section class="dac-section dac-section-light" id="build-apps"><div class="wrap">
+<section class="dac-section dac-light" id="build-apps"><div class="wrap">
   <h1 class="dac-section-title">Build Beautiful Apps</h1>
   <div class="dac-section-subtitle">
     Resources to get you started with designing and developing for Android.
diff --git a/docs/html-intl/intl/ru/sdk/index.jd b/docs/html-intl/intl/ru/sdk/index.jd
index 6b986e7..d94e456 100644
--- a/docs/html-intl/intl/ru/sdk/index.jd
+++ b/docs/html-intl/intl/ru/sdk/index.jd
@@ -1,62 +1,14 @@
 page.title=Загрузка Android Studio и инструментов SDK
 page.tags=sdk, android studio
 page.template=sdk
+page.image=images/cards/android-studio_2x.png
 header.hide=1
 page.metaDescription=Загрузите официальные средства разработки Android для создания приложений для смартфонов, планшетов, носимых устройств, телевизоров и многих других устройств под управлением ОС Android.
 
-studio.version=1.4.0.10
-
-studio.linux_bundle_download=android-studio-ide-141.2288178-linux.zip
-studio.linux_bundle_bytes=380821638
-studio.linux_bundle_checksum=137e3734f2e8e285bd7c1d2fae2e8548d0f164bd
-
-studio.mac_bundle_download=android-studio-ide-141.2288178-mac.dmg
-studio.mac_bundle_bytes=364624965
-studio.mac_bundle_checksum=27068d59d5a78717d31bdedd054082b5c50d3897
-
-studio.win_bundle_download=android-studio-ide-141.2288178-windows.zip
-studio.win_bundle_bytes=373492997
-studio.win_bundle_checksum=c0851dc9a506ba9f4c1379a3e9b4019c08478220
-
-
-studio.win_bundle_exe_download=android-studio-bundle-141.2288178-windows.exe
-studio.win_bundle_exe_bytes=1177811944
-studio.win_bundle_exe_checksum=a2f0141d35f8f0c24dad2ff390e7f6231c5f7625
-
-studio.win_notools_exe_download=android-studio-ide-141.2288178-windows.exe
-studio.win_notools_exe_bytes=348295968
-studio.win_notools_exe_checksum=82d0d9c78ec23834956f941a07821be347fcb7bf
-
-
-
-
-sdk.linux_download=android-sdk_r24.3.4-linux.tgz
-sdk.linux_bytes=309138331
-sdk.linux_checksum=fb293d7bca42e05580be56b1adc22055d46603dd
-
-sdk.mac_download=android-sdk_r24.3.4-macosx.zip
-sdk.mac_bytes=98340900
-sdk.mac_checksum=128f10fba668ea490cc94a08e505a48a608879b9
-
-sdk.win_download=android-sdk_r24.3.4-windows.zip
-sdk.win_bytes=187496897
-sdk.win_checksum=4a8718fb4a2bf2128d34b92f23ddd79fc65839e7
-
-
-sdk.win_installer=installer_r24.3.4-windows.exe
-sdk.win_installer_bytes=139477985
-sdk.win_installer_checksum=094dd45f98a31f839feae898b48f23704f2878dd
-
-
-
-
-
-
 @jd:body
 
 <style type="text/css">
   .offline {display:none;}
-  a.download-bundle-button {display:block;}
   h2.feature {
     padding-top:30px;
     margin-top:0;
@@ -64,20 +16,7 @@
   }
   .feature-blurb {
   margin:0px; font-size:16px; font-weight:300;
-  padding:40px 0 0 0;
-  }
-
-  .landing-button.green {
-    font-size:16px;
-    background-color:#90c653;
-    padding:8px 10px 10px;
-    margin:0;
-    width:206px;
-    text-align:center;
-  }
-
-  .landing-button.green:hover {
-    background-color:#85b84f;
+  padding-top:40px;
   }
 
   .landing-button .small {
@@ -95,8 +34,8 @@
     white-space: nowrap;
     text-indent: -10000px;
     font-size:0px;
-    background: url(../images/tools/studio-logo.png);
-    background-image: -webkit-image-set(url(../images/tools/studio-logo.png) 1x, url(../images/tools/studio-logo_2x.png) 2x);
+    background: url({@docRoot}images/tools/studio-logo.png);
+    background-image: -webkit-image-set(url({@docRoot}images/tools/studio-logo.png) 1x, url({@docRoot}images/tools/studio-logo_2x.png) 2x);
     background-size: 226px 78px;
   }
 
@@ -292,15 +231,15 @@
 <p style="font-size: 16px; color:#bbb; position: absolute;left: 297px; top: 5px; display: block;
 width: 400px;text-align: center;">Официальная среда разработки Android</p>
 
-<ul style="font-size:12px">
+<ul style="font-size:12px;line-height:19px;">
 <li>Среда разработки Android Studio</li>
 <li>Инструменты Android SDK</li>
 <li>Платформа Android 6.0 (Marshmallow)</li>
 <li>Системный образ Android 6.0 с API Google для эмулятора</li>
 </ul>
 
-
-<a class="online landing-button green download-bundle-button" style="margin-top:30px;" href="#Other">Download</a>
+<a class="online landing-button green download-bundle-button"
+href="#Other" >Download Android Studio<br/><span class='small'></span></a>
 
 <!-- this appears when viewing the offline docs -->
 <p class="offline">
diff --git a/docs/html-intl/intl/ru/sdk/installing/adding-packages.jd b/docs/html-intl/intl/ru/sdk/installing/adding-packages.jd
index 81bfe18..19d1edd2 100644
--- a/docs/html-intl/intl/ru/sdk/installing/adding-packages.jd
+++ b/docs/html-intl/intl/ru/sdk/installing/adding-packages.jd
@@ -1,7 +1,6 @@
 page.title=Добавление пакетов SDK
 
 page.tags=менеджер sdk
-helpoutsWidget=true
 
 @jd:body
 
@@ -31,7 +30,7 @@
   line-height:20px;
   padding:0 0 0 20px;
   margin:0 0 20px 0;
-  display:inline-block;
+  display:inline;
   font-weight:normal;
 }
 ol.large > li:nth-child(1):before {
diff --git a/docs/html-intl/intl/vi/design/index.jd b/docs/html-intl/intl/vi/design/index.jd
deleted file mode 100644
index d72636f..0000000
--- a/docs/html-intl/intl/vi/design/index.jd
+++ /dev/null
@@ -1,186 +0,0 @@
-page.title=Material Design cho Android
-page.tags=Material,design
-page.type=thiết kế
-page.image=images/cards/design-material-for-android_2x.jpg
-
-@jd:body
-
-<!-- developer docs box -->
-<a class="notice-developers right" href="{@docRoot}training/material/index.html">
-  <div>
-    <h3>Tài liệu cho Nhà phát triển</h3>
-    <p>Tạo ứng dụng với Material Design</p>
-  </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=p4gmvHyuZzw">
-<div>
-    <h3>Video</h3>
-    <p>Giới thiệu Material Design</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=YaG_ljfzeUw">
-<div>
-    <h3>Video</h3>
-    <p>Giấy và Mực: Những vật liệu quan trọng</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=XOcCOBe8PTc">
-<div>
-    <h3>Video</h3>
-    <p>Material Design trong Google I/O App</p>
-</div>
-</a>
-
-
-
-<p itemprop="description">Material design là một hướng dẫn toàn diện về thiết kế
-trực quan, chuyển động và tương tác giữa nhiều nền tảng và thiết bị. Hiện nay Android có hỗ trợ
-những ứng dụng theo phong cách material design. Để sử dụng material design trong ứng dụng Androi của mình, hãy làm theo hướng dẫn nêu
-trong <a href="http://www.google.com/design/spec">đặc tả material design</a> và sử dụng
-những thành phần và tính năng mới sẵn có trong Android 5.0 (API mức 21) trở lên.</p>
-
-<p>Android cung cấp những phần tử sau để bạn dựng ứng dụng theo phong cách material design:</p>
-
-<ul>
-  <li>Một giao diện mới</li>
-  <li>Widget mới cho các dạng xem phức tạp</li>
-  <li>API mới cho đổ bóng và hoạt hình tùy chỉnh</li>
-</ul>
-
-<p>Để biết thêm thông tin về triển khai material design trên Android, hãy xem
-<a href="{@docRoot}training/material/index.html">Tạo ứng dụng với Material Design</a>.</p>
-
-
-<h3>Giao diện Material</h3>
-
-<p>Giao diện material mang đến một phong cách mới cho ứng dụng của bạn và các widget hệ thống, cho phép bạn đặt
-bảng màu của chúng và hoạt hình mặc định cho phản hồi chạm và chuyển tiếp hoạt động.</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/MaterialDark.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">Giao diện material tối</p>
-  </div>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/MaterialLight.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">Giao diện material sáng</p>
-  </div>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>Để biết thêm thông tin, hãy xem phần <a href="{@docRoot}training/material/theme.html">Sử dụng Giao diện Material
-</a>.</p>
-
-
-<h3>Danh sách và Thẻ</h3>
-
-<p>Android cung cấp hai loại widget mới để hiển thị thẻ và danh sách bằng phong cách
-và hoạt hình material design:</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/list_mail.png" width="500" height="426" />
-  <p>Widget <code>RecyclerView</code> mới là một phiên bản có thể ghép nối hơn của <code>ListView</code>
-  có hỗ trợ nhiều kiểu bố trí khác nhau và cải thiện hiệu năng.</p>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/card_travel.png" width="500" height="426" />
-  <p>Widget <code>CardView</code> mới cho phép bạn hiển thị những mẩu thông tin quan trọng bên trong
-  thẻ với diện mạo và cảm nhận nhất quán.</p>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>Để biết thêm thông tin, hãy xem phần <a href="{@docRoot}training/material/lists-cards.html">Tạo Danh sách
-và Thẻ</a>.</p>
-
-
-<h3>Đổ bóng Dạng xem</h3>
-
-<p>Bên cạnh các thuộc tính X và Y, dạng xem trong Android nay có
-thêm thuộc tính Z. Thuộc tính mới này biểu diễn độ cao của một dạng xem và sẽ quyết định:</p>
-
-<ul>
-<li>Kích cỡ của đổ bóng: dạng xem có giá trị Z cao hơn sẽ đặt đổ bóng lớn hơn.</li>
-<li>Thứ tự vẽ: dạng xem có giá trị Z cao hơn sẽ xuất hiện phía trên những dạng xem khác.</li>
-</ul>
-
-<div style="width:290px;margin-left:35px;float:right">
-  <div class="framed-nexus5-port-span-5">
-  <video class="play-on-hover" autoplay>
-    <source src="{@docRoot}design/material/videos/ContactsAnim.mp4"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.webm"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.ogv"/>
-  </video>
-  </div>
-  <div style="font-size:10pt;margin-left:20px;margin-bottom:30px">
-    <em>Để phát lại phim, nhấp vào màn hình thiết bị</em>
-  </div>
-</div>
-
-<p>Để biết thêm thông tin, hãy xem phần <a href="{@docRoot}training/material/shadows-clipping.html">Định nghĩa
-Đổ bóng và Dạng xem Cắt hình</a>.</p>
-
-
-<h3>Hoạt hình</h3>
-
-<p>API hoạt hình mới cho phép bạn tạo hoạt hình tùy chỉnh cho phản hồi chạm trong điều khiển UI,
-thay đổi trạng thái xem và chuyển tiếp hoạt động.</p>
-
-<p>Những API này cho phép bạn:</p>
-
-<ul>
-<li style="margin-bottom:15px">
-Phản hồi lại sự kiện chạm trong dạng xem của mình bằng hoạt hình <strong>phản hồi chạm</strong>.
-</li>
-<li style="margin-bottom:15px">
-Ẩn và hiện dạng xem bằng hoạt hình <strong>hiện hình tròn</strong>.
-</li>
-<li style="margin-bottom:15px">
-Chuyển giữa các hoạt động bằng hoạt hình <strong>chuyển tiếp hoạt động</strong> tùy chỉnh.
-</li>
-<li style="margin-bottom:15px">
-Tạo hoạt hình tự nhiên hơn bằng <strong>chuyển động cong</strong>.
-</li>
-<li style="margin-bottom:15px">
-Tạo hoạt hình cho các thay đổi trong một hoặc nhiều thuộc tính dạng xem bằng hoạt hình <strong>thay đổi trạng thái dạng xem</strong>.
-</li>
-<li style="margin-bottom:15px">
-Thể hiện hoạt hình trong các <strong>nội dung vẽ được theo danh sách trạng thái</strong> giữa những thay đổi về trạng thái dạng xem.
-</li>
-</ul>
-
-<p>Hoạt hình phản hồi chạm được tích hợp vào một vài dạng xem tiêu chuẩn, ví dụ như các nút. Các API mới này
-cho phép bạn tùy biến những hoạt hình này và thêm chúng vào dạng xem tùy chỉnh của mình.</p>
-
-<p>Để biết thêm thông tin, hãy xem phần <a href="{@docRoot}training/material/animations.html">Định nghĩa Hoạt hình
-Tùy chỉnh</a>.</p>
-
-
-<h3>Nội dung vẽ được</h3>
-
-<p>Những khả năng mới này của nội dung vẽ được sẽ giúp bạn triển khai các ứng dụng theo phong cách material design:</p>
-
-<ul>
-<li><strong>Nội dung vẽ được véc-tơ</strong> có thể thay đổi kích cỡ mà không làm mất độ sắc nét và hoàn hảo
-cho các biểu tượng trong ứng dụng đơn sắc.</li>
-<li><strong>Nhuộm nội dung vẽ được</strong> cho phép bạn định nghĩa ảnh bitmap thành mặt nạ alpha và nhuộm
-màu cho chúng theo thời gian chạy.</li>
-<li><strong>Trích xuất màu</strong> cho phép bạn tự động trích xuất màu nổi bật từ
-hình ảnh bitmap.</li>
-</ul>
-
-<p>Để biết thêm thông tin, hãy xem phần <a href="{@docRoot}training/material/drawables.html">Làm việc với
-Nội dung Vẽ được</a>.</p>
diff --git a/docs/html-intl/intl/vi/design/material/index.jd b/docs/html-intl/intl/vi/design/material/index.jd
index f66d6f6..d72636f 100644
--- a/docs/html-intl/intl/vi/design/material/index.jd
+++ b/docs/html-intl/intl/vi/design/material/index.jd
@@ -39,13 +39,8 @@
 
 
 
-<<<<<<< HEAD
 <p itemprop="description">Material design là một hướng dẫn toàn diện về thiết kế
 trực quan, chuyển động và tương tác giữa nhiều nền tảng và thiết bị. Hiện nay Android có hỗ trợ
-=======
-<p itemprop="description">Material Design là một hướng dẫn toàn diện về thiết kế
-trực quan, chuyển động và tương tác giữa nhiều nền tảng và thiết bị. Hiện nay, Android có hỗ trợ
->>>>>>> Docs: L10N update for design documentation
 những ứng dụng theo phong cách material design. Để sử dụng material design trong ứng dụng Androi của mình, hãy làm theo hướng dẫn nêu
 trong <a href="http://www.google.com/design/spec">đặc tả material design</a> và sử dụng
 những thành phần và tính năng mới sẵn có trong Android 5.0 (API mức 21) trở lên.</p>
@@ -64,11 +59,7 @@
 
 <h3>Giao diện Material</h3>
 
-<<<<<<< HEAD
 <p>Giao diện material mang đến một phong cách mới cho ứng dụng của bạn và các widget hệ thống, cho phép bạn đặt
-=======
-<p>Giao diện material mang đến một phong cách mới cho ứng dụng của bạn và widget hệ thống, cho phép bạn đặt
->>>>>>> Docs: L10N update for design documentation
 bảng màu của chúng và hoạt hình mặc định cho phản hồi chạm và chuyển tiếp hoạt động.</p>
 
 <!-- two columns -->
@@ -94,25 +85,15 @@
 
 <h3>Danh sách và Thẻ</h3>
 
-<<<<<<< HEAD
 <p>Android cung cấp hai loại widget mới để hiển thị thẻ và danh sách bằng phong cách
 và hoạt hình material design:</p>
-=======
-<p>Android cung cấp hai loại widget mới để hiển thị thẻ và danh sách bằng các kiểu dáng
-và hoạt hình theo phong cách material design:</p>
->>>>>>> Docs: L10N update for design documentation
 
 <!-- two columns -->
 <div style="width:700px;margin-top:25px;margin-bottom:20px">
 <div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
   <img src="{@docRoot}design/material/images/list_mail.png" width="500" height="426" />
-<<<<<<< HEAD
   <p>Widget <code>RecyclerView</code> mới là một phiên bản có thể ghép nối hơn của <code>ListView</code>
   có hỗ trợ nhiều kiểu bố trí khác nhau và cải thiện hiệu năng.</p>
-=======
-  <p>Widget <code>RecyclerView</code> mới là một phiên bản dễ ghép nối hơn của <code>ListView</code>
-  có hỗ trợ nhiều kiểu bố cục khác nhau và cải thiện hiệu năng.</p>
->>>>>>> Docs: L10N update for design documentation
 </div>
 <div style="float:left;width:250px;margin-right:0px;">
   <img src="{@docRoot}design/material/images/card_travel.png" width="500" height="426" />
@@ -128,21 +109,12 @@
 
 <h3>Đổ bóng Dạng xem</h3>
 
-<<<<<<< HEAD
 <p>Bên cạnh các thuộc tính X và Y, dạng xem trong Android nay có
 thêm thuộc tính Z. Thuộc tính mới này biểu diễn độ cao của một dạng xem và sẽ quyết định:</p>
 
 <ul>
 <li>Kích cỡ của đổ bóng: dạng xem có giá trị Z cao hơn sẽ đặt đổ bóng lớn hơn.</li>
 <li>Thứ tự vẽ: dạng xem có giá trị Z cao hơn sẽ xuất hiện phía trên những dạng xem khác.</li>
-=======
-<p>Bên cạnh các thuộc tính X và Y, dạng xem trong Android nay có thêm thuộc tính Z
-. Thuộc tính mới này biểu diễn độ cao của một dạng xem và sẽ quyết định:</p>
-
-<ul>
-<li>Kích cỡ của đổ bóng: dạng xem với giá trị Z cao hơn sẽ có đổ bóng lớn hơn.</li>
-<li>Thứ tự vẽ: dạng xem với giá trị Z cao hơn sẽ xuất hiện ở trên những dạng xem khác.</li>
->>>>>>> Docs: L10N update for design documentation
 </ul>
 
 <div style="width:290px;margin-left:35px;float:right">
@@ -154,11 +126,7 @@
   </video>
   </div>
   <div style="font-size:10pt;margin-left:20px;margin-bottom:30px">
-<<<<<<< HEAD
     <em>Để phát lại phim, nhấp vào màn hình thiết bị</em>
-=======
-    <em>Để phát lại phim, hãy nhấp vào màn hình thiết bị</em>
->>>>>>> Docs: L10N update for design documentation
   </div>
 </div>
 
@@ -181,11 +149,7 @@
 Ẩn và hiện dạng xem bằng hoạt hình <strong>hiện hình tròn</strong>.
 </li>
 <li style="margin-bottom:15px">
-<<<<<<< HEAD
 Chuyển giữa các hoạt động bằng hoạt hình <strong>chuyển tiếp hoạt động</strong> tùy chỉnh.
-=======
-Chuyển giữa các hoạt động và hoạt hình <strong>chuyển tiếp hoạt động</strong> tùy chỉnh.
->>>>>>> Docs: L10N update for design documentation
 </li>
 <li style="margin-bottom:15px">
 Tạo hoạt hình tự nhiên hơn bằng <strong>chuyển động cong</strong>.
diff --git a/docs/html-intl/intl/vi/sdk/index.jd b/docs/html-intl/intl/vi/sdk/index.jd
index af01ede..4d6bfec 100644
--- a/docs/html-intl/intl/vi/sdk/index.jd
+++ b/docs/html-intl/intl/vi/sdk/index.jd
@@ -1,62 +1,14 @@
 page.title=Tải xuống Android Studio và SDK Tools
 page.tags=sdk, android studio
 page.template=sdk
+page.image=images/cards/android-studio_2x.png
 header.hide=1
 page.metaDescription=Tải xuống Android IDE chính thức và bộ công cụ cho nhà phát triển để xây dựng ứng dụng cho điện thoại, máy tính bảng, thiết bị đeo được, TV chạy Android và nhiều thiết bị khác.
 
-studio.version=1.4.0.10
-
-studio.linux_bundle_download=android-studio-ide-141.2288178-linux.zip
-studio.linux_bundle_bytes=380821638
-studio.linux_bundle_checksum=137e3734f2e8e285bd7c1d2fae2e8548d0f164bd
-
-studio.mac_bundle_download=android-studio-ide-141.2288178-mac.dmg
-studio.mac_bundle_bytes=364624965
-studio.mac_bundle_checksum=27068d59d5a78717d31bdedd054082b5c50d3897
-
-studio.win_bundle_download=android-studio-ide-141.2288178-windows.zip
-studio.win_bundle_bytes=373492997
-studio.win_bundle_checksum=c0851dc9a506ba9f4c1379a3e9b4019c08478220
-
-
-studio.win_bundle_exe_download=android-studio-bundle-141.2288178-windows.exe
-studio.win_bundle_exe_bytes=1177811944
-studio.win_bundle_exe_checksum=a2f0141d35f8f0c24dad2ff390e7f6231c5f7625
-
-studio.win_notools_exe_download=android-studio-ide-141.2288178-windows.exe
-studio.win_notools_exe_bytes=348295968
-studio.win_notools_exe_checksum=82d0d9c78ec23834956f941a07821be347fcb7bf
-
-
-
-
-sdk.linux_download=android-sdk_r24.3.4-linux.tgz
-sdk.linux_bytes=309138331
-sdk.linux_checksum=fb293d7bca42e05580be56b1adc22055d46603dd
-
-sdk.mac_download=android-sdk_r24.3.4-macosx.zip
-sdk.mac_bytes=98340900
-sdk.mac_checksum=128f10fba668ea490cc94a08e505a48a608879b9
-
-sdk.win_download=android-sdk_r24.3.4-windows.zip
-sdk.win_bytes=187496897
-sdk.win_checksum=4a8718fb4a2bf2128d34b92f23ddd79fc65839e7
-
-
-sdk.win_installer=installer_r24.3.4-windows.exe
-sdk.win_installer_bytes=139477985
-sdk.win_installer_checksum=094dd45f98a31f839feae898b48f23704f2878dd
-
-
-
-
-
-
 @jd:body
 
 <style type="text/css">
   .offline {display:none;}
-  a.download-bundle-button {display:block;}
   h2.feature {
     padding-top:30px;
     margin-top:0;
@@ -64,20 +16,7 @@
   }
   .feature-blurb {
   margin:0px; font-size:16px; font-weight:300;
-  padding:40px 0 0 0;
-  }
-
-  .landing-button.green {
-    font-size:16px;
-    background-color:#90c653;
-    padding:8px 10px 10px;
-    margin:0;
-    width:206px;
-    text-align:center;
-  }
-
-  .landing-button.green:hover {
-    background-color:#85b84f;
+  padding-top:40px;
   }
 
   .landing-button .small {
@@ -95,8 +34,8 @@
     white-space: nowrap;
     text-indent: -10000px;
     font-size:0px;
-    background: url(../images/tools/studio-logo.png);
-    background-image: -webkit-image-set(url(../images/tools/studio-logo.png) 1x, url(../images/tools/studio-logo_2x.png) 2x);
+    background: url({@docRoot}images/tools/studio-logo.png);
+    background-image: -webkit-image-set(url({@docRoot}images/tools/studio-logo.png) 1x, url({@docRoot}images/tools/studio-logo_2x.png) 2x);
     background-size: 226px 78px;
   }
 
@@ -292,15 +231,15 @@
 <p style="font-size: 16px; color:#bbb; position: absolute;left: 297px; top: 5px; display: block;
 width: 400px;text-align: center;">IDE Android chính thức</p>
 
-<ul style="font-size:12px">
+<ul style="font-size:12px;line-height:19px;">
 <li>IDE Android Studio</li>
 <li>Bộ công cụ SDK Android</li>
 <li>Nền tảng Android 6.0 (Marshmallow)</li>
 <li>Ảnh hệ thống trình mô phỏng Android 6.0 cùng các API của Google</li>
 </ul>
 
-
-<a class="online landing-button green download-bundle-button" style="margin-top:30px;" href="#Other">Download</a>
+<a class="online landing-button green download-bundle-button"
+href="#Other" >Download Android Studio<br/><span class='small'></span></a>
 
 <!-- this appears when viewing the offline docs -->
 <p class="offline">
diff --git a/docs/html-intl/intl/vi/sdk/installing/adding-packages.jd b/docs/html-intl/intl/vi/sdk/installing/adding-packages.jd
index 728c92d..1c9072c 100644
--- a/docs/html-intl/intl/vi/sdk/installing/adding-packages.jd
+++ b/docs/html-intl/intl/vi/sdk/installing/adding-packages.jd
@@ -1,7 +1,6 @@
 page.title=Thêm Gói SDK
 
 page.tags=trình quản lý sdk
-helpoutsWidget=true
 
 @jd:body
 
@@ -31,7 +30,7 @@
   line-height:20px;
   padding:0 0 0 20px;
   margin:0 0 20px 0;
-  display:inline-block;
+  display:inline;
   font-weight:normal;
 }
 ol.large > li:nth-child(1):before {
diff --git a/docs/html-intl/intl/zh-cn/design/index.jd b/docs/html-intl/intl/zh-cn/design/index.jd
deleted file mode 100644
index f33d4bc..0000000
--- a/docs/html-intl/intl/zh-cn/design/index.jd
+++ /dev/null
@@ -1,186 +0,0 @@
-page.title=Android 材料设计
-page.tags=Material,design
-page.type=设计
-page.image=images/cards/design-material-for-android_2x.jpg
-
-@jd:body
-
-<!-- developer docs box -->
-<a class="notice-developers right" href="{@docRoot}training/material/index.html">
-  <div>
-    <h3>开发者文档</h3>
-    <p>使用材料设计创建应用</p>
-  </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=p4gmvHyuZzw">
-<div>
-    <h3>视频</h3>
-    <p>材料设计简介</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=YaG_ljfzeUw">
-<div>
-    <h3>视频</h3>
-    <p>纸张和墨水:相关材料</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=XOcCOBe8PTc">
-<div>
-    <h3>视频</h3>
-    <p>Google I/O 应用中的材料设计</p>
-</div>
-</a>
-
-
-
-<p itemprop="description">材料设计是专为设计适用于多个平台和设备的视觉、运动与互动效果而制定的综合指南。
-Android 现在已支持材料设计应用。
-如果要在您的 Android 应用中使用材料设计,请遵循<a href="http://www.google.com/design/spec">材料设计规范</a>内定义的指导方针,并使用 Android 5.0(API 级别 21)及以上版本所提供的新组件和功能。
-
-</p>
-
-<p>Android 为您提供了以下元素来构建材料设计应用:</p>
-
-<ul>
-  <li>全新的风格主题</li>
-  <li>用于设计复杂视图的全新小工具</li>
-  <li>用于自定义阴影和动画的全新 API</li>
-</ul>
-
-<p>有关在 Android 上实现材料设计的详细信息,请参阅<a href="{@docRoot}training/material/index.html">使用材料设计创建应用</a>。
-</p>
-
-
-<h3>材料主题</h3>
-
-<p>材料主题提供了新的应用样式和系统小工具,让您能够为触摸反馈以及 Activity 转换设置配色工具以及默认动画。
-</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/MaterialDark.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">深色材料主题</p>
-  </div>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/MaterialLight.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">浅色材料主题</p>
-  </div>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>如需了解详细信息,请参阅<a href="{@docRoot}training/material/theme.html">使用材料主题
-</a>。</p>
-
-
-<h3>列表和卡片</h3>
-
-<p>Android 提供了两个全新的小工具,用于显示采用材料设计样式和动画的卡片和列表:
-</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/list_mail.png" width="500" height="426" />
-  <p>全新的 <code>RecyclerView</code> 小工具是 <code>ListView</code>
- 的可插入版本,支持不同的布局类型,并且具有更高性能。</p>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/card_travel.png" width="500" height="426" />
-  <p>全新的 <code>CardView</code> 小工具可让您展示卡片内的重要信息,并且有统一的观感。
-</p>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>如需了解详细信息,请参阅<a href="{@docRoot}training/material/lists-cards.html">创建列表和卡片</a>。
-</p>
-
-
-<h3>视图阴影</h3>
-
-<p>除了 X 和 Y 属性之外,Android 中的视图现在还提供了 Z
-属性。这一新属性用于展现视图的高度,从而确定:</p>
-
-<ul>
-<li>阴影的大小:Z 值越高的视图投射的阴影越长。</li>
-<li>绘制顺序:Z 值较高的视图会显示在其他视图的上方。</li>
-</ul>
-
-<div style="width:290px;margin-left:35px;float:right">
-  <div class="framed-nexus5-port-span-5">
-  <video class="play-on-hover" autoplay>
-    <source src="{@docRoot}design/material/videos/ContactsAnim.mp4"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.webm"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.ogv"/>
-  </video>
-  </div>
-  <div style="font-size:10pt;margin-left:20px;margin-bottom:30px">
-    <em>如果要重新播放影片,请点击设备屏幕</em>
-  </div>
-</div>
-
-<p>如需了解详细信息,请参阅<a href="{@docRoot}training/material/shadows-clipping.html">定义阴影与裁剪视图</a>。
-</p>
-
-
-<h3>动画</h3>
-
-<p>动画 API 让您可为 UI 控件中的触摸反馈、视图状态更改以及 Activity 转换创建自定义动画。
-</p>
-
-<p>这些 API 的作用是:</p>
-
-<ul>
-<li style="margin-bottom:15px">
-使用<strong>触摸反馈</strong>动画响应视图中的触摸事件。
-</li>
-<li style="margin-bottom:15px">
-使用<strong>循环显示</strong>动画隐藏和显示视图。
-</li>
-<li style="margin-bottom:15px">
-使用自定义 <strong>Activity 转换</strong>动画切换 Activity。
-</li>
-<li style="margin-bottom:15px">
-使用<strong>曲线运动</strong>创建更自然的动画。
-</li>
-<li style="margin-bottom:15px">
-使用<strong>视图状态更改</strong>动画以动画形式呈现一个或多个视图属性的更改。
-</li>
-<li style="margin-bottom:15px">
-在视图状态更改期间以<strong>可绘制状态列表</strong>显示动画。
-</li>
-</ul>
-
-<p>触摸反馈动画内建于数个标准视图(例如按钮)中。全新的 API让您可以自定义这些动画并将其添加至自己的自定义视图中。
-</p>
-
-<p>如需了解详细信息,请参阅<a href="{@docRoot}training/material/animations.html">定义自定义动画</a>。
-</p>
-
-
-<h3>可绘制对象</h3>
-
-<p>下列可绘制对象的新功能将帮助您实现材料设计应用:</p>
-
-<ul>
-<li><strong>可绘制矢量</strong>可在不影响清晰度的情况下进行缩放,非常适合单色应用内图标。
-</li>
-<li><strong>可绘制底色</strong>可让您将位图定义为 alpha 蒙板,并在运行时为其着色。
-</li>
-<li><strong>颜色提取</strong>可让您从位图图像自动提取突出色彩。
-</li>
-</ul>
-
-<p>如需了解详细信息,请参阅<a href="{@docRoot}training/material/drawables.html">使用可绘制内容</a>。
-</p>
diff --git a/docs/html-intl/intl/zh-cn/design/material/index.jd b/docs/html-intl/intl/zh-cn/design/material/index.jd
index f33d4bc..b667bb8 100644
--- a/docs/html-intl/intl/zh-cn/design/material/index.jd
+++ b/docs/html-intl/intl/zh-cn/design/material/index.jd
@@ -1,6 +1,5 @@
 page.title=Android 材料设计
-page.tags=Material,design
-page.type=设计
+page.tags=Material,design,设计
 page.image=images/cards/design-material-for-android_2x.jpg
 
 @jd:body
diff --git a/docs/html-intl/intl/zh-cn/distribute/tools/promote/brand.jd b/docs/html-intl/intl/zh-cn/distribute/tools/promote/brand.jd
index 065673e..8984fc5 100644
--- a/docs/html-intl/intl/zh-cn/distribute/tools/promote/brand.jd
+++ b/docs/html-intl/intl/zh-cn/distribute/tools/promote/brand.jd
@@ -69,77 +69,6 @@
 
   <p>不得使用 Android 徽标专用的字体。</p>
 
-  <h2 id="brand-google_play">Google Play</h2>
-
-
-   <p>以下是关于 Google Play 品牌和相关资源的指南。</p>
-
-  <h4>在文本中使用 Google Play</h4>
-
-  <p>在文本中,请务必为首次出现或位于显著位置的 Google Play™ 加上 TM 符号。</p>
-
-  <p>在提及移动设备体验时,除非相应文本中是很明显的说明性内容,否则请使用“Google Play”。例如,营销资料的标题可以是“从 Google Play™ 下载我们的游戏”,但是说明性内容可以是“使用 Google Play™ 商店应用下载我们的游戏”。
-
-   <p>每次使用 Google Play 名称或图标时,你的资料中都应注明以下归属信息:</p>
-
-  <blockquote><em>Google Play 是 Google Inc. 的商标。</em></blockquote>
-
-
-    <div style="float:right;width:96px;margin-left:30px">
-       <img src="{@docRoot}images/brand/Google_Play_Store_96.png" alt="" />
-      <p style="text-align:center">
-         <a href="{@docRoot}images/brand/Google_Play_Store_48.png">48x48</a> |
-         <a href="{@docRoot}images/brand/Google_Play_Store_96.png">96x96</a><br />
-         <a href="{@docRoot}images/brand/Google_Play_Store_600.png">600x576</a>
-         </p>
-    </div>
-
-  <h4>Google Play 商店图标</h4>
-
-  <p>你可以使用 Google Play 商店图标,但不得修改它。</p>
-
-  <p>如上文所述,在文案中提及 Google Play 商店应用时,请使用全称:“Google Play 商店”。但直接标注 Google Play 商店图标时,可以只使用“Play 商店”,以便与设备上显示的图标标签一致。</p>
-
-
-  <h4>Google Play 徽章</h4>
-
-    <div style="float:right;clear:right;width:172px;margin-left:30px">
-      <img src="{@docRoot}images/brand/en_app_rgb_wo_60.png" alt="" />
-      <p style="text-align:center">
-         <a href="{@docRoot}images/brand/en_app_rgb_wo_45.png">129x45</a> |
-         <a href="{@docRoot}images/brand/en_app_rgb_wo_60.png">172x60</a></p>
-    </div>
-
-    <div style="float:right;clear:right;width:172px;margin-left:30px">
-      <img src="{@docRoot}images/brand/en_generic_rgb_wo_60.png" alt="" />
-      <p style="text-align:center">
-         <a href="{@docRoot}images/brand/en_generic_rgb_wo_45.png">129x45</a> |
-         <a href="{@docRoot}images/brand/en_generic_rgb_wo_60.png">172x60</a></p>
-    </div>
-
-    <p>你可以在网站和宣传资料中使用“即刻获取 Google Play”和“即刻获取 Android 应用 Google Play”徽标作为徽章,以指向你在 Google Play 上的商品。你也可以使用其他 Google Play 徽章格式,以及用于音乐、图书、杂志、电影和电视节目的徽章。要申请这些徽章,请使用 <a href="https://docs.google.com/forms/d/1YE5gZpAAcFKjYcUddCsK1Bv9a9Y-luaLVnkazVlaJ2w/viewform">Android 和 Google Play 品牌权限咨询表单</a>。</p>
-
-    <ul>
-      <li>请不要修改徽章图片的颜色、比例、间距或其他任何方面。
-      </li>
-      <li>当与其他应用市场的徽标一起使用时,Google Play 徽标尺寸不应小于这些徽标的尺寸。</li>
-      <li>在线使用时,徽章应链接至以下内容之一:
-        <ul>
-          <li>由你发布的商品的列表,例如:<br />
-          <span style="margin-left:1em">http://play.google.com/store/search?q=publisherName<em></em></span>
-          </li>
-          <li>Google Play 中相应应用的商品详情页,例如:<br />
-          <span style="margin-left:1em">http://play.google.com/store/apps/details?id=packageName<em></em></span>
-          </li>
-        </ul>
-      </li>
-    </ul>
-
-    <p>要快速创建链接至你在 Google Play 上的应用的徽章,请使用 <a href="{@docRoot}distribute/tools/promote/badges.html">Google Play 徽章生成器</a>(支持 40 多种语言)。</p>
-
-    <p>要创建自定义尺寸的徽章,请下载<a href="{@docRoot}distribute/tools/promote/badge-files.html">支持 40 多种语言的 Google Play 徽章</a>的 Adobe® Illustrator® (.ai) 文件。</p>
-
-    <p>要详细了解如何链接至 Google Play 中的商品详情页,请参阅<a href="{@docRoot}distribute/tools/promote/linking.html">链接至你的商品</a>。</p>
 
   <h2 id="Marketing_Review">营销审核和品牌咨询</h2>
 
diff --git a/docs/html-intl/intl/zh-cn/index.jd b/docs/html-intl/intl/zh-cn/index.jd
index b392895..c915863 100644
--- a/docs/html-intl/intl/zh-cn/index.jd
+++ b/docs/html-intl/intl/zh-cn/index.jd
@@ -5,6 +5,16 @@
 
 @jd:body
 
+<script>
+  $(document).ready(function() {
+    if (useUpdatedTemplates) {
+      $("#useUpdatedTemplates").css("display","block");
+    } else {
+      $("#useOldTemplates").css("display","block");
+    }
+  })
+</script>
+
 <!-- <div class="dac-hero-carousel" data-carousel-query="collection:index/carousel">
 </div> -->
 <section class="dac-hero-carousel">
@@ -39,11 +49,39 @@
 </a>
 </article></section>
 
-<div class="actions-bar dac-expand dac-invert">
+<div id="useUpdatedTemplates" style="display:none" class="dac-section dac-slim dac-gray dac-expand">
   <div class="wrap dac-offset-parent">
     <a class="dac-fab dac-scroll-button" data-scroll-button href="#build-apps">
       <i class="dac-sprite dac-arrow-down-gray"></i>
     </a>
+    <ul class="dac-actions">
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}sdk/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Get the SDK
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}samples/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Browse sample code
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}distribute/stories/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Watch stories
+        </a>
+      </li>
+    </ul>
+  </div><!-- end .wrap -->
+</div><!-- end .dac-actions -->
+
+<div id="useOldTemplates" style="display:none" class="actions-bar dac-expand dac-invert">
+  <div class="wrap dac-offset-parent">
+    <a class="dac-fab dac-scroll-button" data-scroll-button="" href="#build-apps">
+      <i class="dac-sprite dac-arrow-down-gray"></i>
+    </a>
     <div class="actions">
       <div><a href="{@docRoot}sdk/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
@@ -53,17 +91,15 @@
         <span class="dac-sprite dac-auto-chevron-large"></span>
         Browse Samples
       </a></div>
-      <div><a href="//www.youtube.com/user/androiddevelopers">
+      <div><a href="{@docRoot}distribute/stories/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
-        Watch Videos
+        Watch Stories
       </a></div>
     </div><!-- end .actions -->
   </div><!-- end .wrap -->
-</div><!-- end .actions-bar -->
+</div>
 
-
-
-<section class="dac-section dac-section-light" id="build-apps"><div class="wrap">
+<section class="dac-section dac-light" id="build-apps"><div class="wrap">
   <h1 class="dac-section-title">Build Beautiful Apps</h1>
   <div class="dac-section-subtitle">
     Resources to get you started with designing and developing for Android.
diff --git a/docs/html-intl/intl/zh-cn/sdk/index.jd b/docs/html-intl/intl/zh-cn/sdk/index.jd
index 2b2e98b..407fc2d 100644
--- a/docs/html-intl/intl/zh-cn/sdk/index.jd
+++ b/docs/html-intl/intl/zh-cn/sdk/index.jd
@@ -1,62 +1,14 @@
 page.title=下载 Android Studio 和 SDK 工具
 page.tags=sdk, android studio
 page.template=sdk
+page.image=images/cards/android-studio_2x.png
 header.hide=1
 page.metaDescription=下载官方 Android IDE 和开发者工具,构建适用于 Android 手机、平板电脑、可穿戴设备、电视等设备的应用。
 
-studio.version=1.4.0.10
-
-studio.linux_bundle_download=android-studio-ide-141.2288178-linux.zip
-studio.linux_bundle_bytes=380821638
-studio.linux_bundle_checksum=137e3734f2e8e285bd7c1d2fae2e8548d0f164bd
-
-studio.mac_bundle_download=android-studio-ide-141.2288178-mac.dmg
-studio.mac_bundle_bytes=364624965
-studio.mac_bundle_checksum=27068d59d5a78717d31bdedd054082b5c50d3897
-
-studio.win_bundle_download=android-studio-ide-141.2288178-windows.zip
-studio.win_bundle_bytes=373492997
-studio.win_bundle_checksum=c0851dc9a506ba9f4c1379a3e9b4019c08478220
-
-
-studio.win_bundle_exe_download=android-studio-bundle-141.2288178-windows.exe
-studio.win_bundle_exe_bytes=1177811944
-studio.win_bundle_exe_checksum=a2f0141d35f8f0c24dad2ff390e7f6231c5f7625
-
-studio.win_notools_exe_download=android-studio-ide-141.2288178-windows.exe
-studio.win_notools_exe_bytes=348295968
-studio.win_notools_exe_checksum=82d0d9c78ec23834956f941a07821be347fcb7bf
-
-
-
-
-sdk.linux_download=android-sdk_r24.3.4-linux.tgz
-sdk.linux_bytes=309138331
-sdk.linux_checksum=fb293d7bca42e05580be56b1adc22055d46603dd
-
-sdk.mac_download=android-sdk_r24.3.4-macosx.zip
-sdk.mac_bytes=98340900
-sdk.mac_checksum=128f10fba668ea490cc94a08e505a48a608879b9
-
-sdk.win_download=android-sdk_r24.3.4-windows.zip
-sdk.win_bytes=187496897
-sdk.win_checksum=4a8718fb4a2bf2128d34b92f23ddd79fc65839e7
-
-
-sdk.win_installer=installer_r24.3.4-windows.exe
-sdk.win_installer_bytes=139477985
-sdk.win_installer_checksum=094dd45f98a31f839feae898b48f23704f2878dd
-
-
-
-
-
-
 @jd:body
 
 <style type="text/css">
   .offline {display:none;}
-  a.download-bundle-button {display:block;}
   h2.feature {
     padding-top:30px;
     margin-top:0;
@@ -64,20 +16,7 @@
   }
   .feature-blurb {
   margin:0px; font-size:16px; font-weight:300;
-  padding:40px 0 0 0;
-  }
-
-  .landing-button.green {
-    font-size:16px;
-    background-color:#90c653;
-    padding:8px 10px 10px;
-    margin:0;
-    width:206px;
-    text-align:center;
-  }
-
-  .landing-button.green:hover {
-    background-color:#85b84f;
+  padding-top:40px;
   }
 
   .landing-button .small {
@@ -95,8 +34,8 @@
     white-space: nowrap;
     text-indent: -10000px;
     font-size:0px;
-    background: url(../images/tools/studio-logo.png);
-    background-image: -webkit-image-set(url(../images/tools/studio-logo.png) 1x, url(../images/tools/studio-logo_2x.png) 2x);
+    background: url({@docRoot}images/tools/studio-logo.png);
+    background-image: -webkit-image-set(url({@docRoot}images/tools/studio-logo.png) 1x, url({@docRoot}images/tools/studio-logo_2x.png) 2x);
     background-size: 226px 78px;
   }
 
@@ -292,15 +231,15 @@
 <p style="font-size: 16px; color:#bbb; position: absolute;left: 297px; top: 5px; display: block;
 width: 400px;text-align: center;">官方 Android IDE</p>
 
-<ul style="font-size:12px">
+<ul style="font-size:12px;line-height:19px;">
 <li>Android Studio IDE</li>
 <li>Android SDK 工具</li>
 <li>Android 6.0 (Marshmallow) 平台</li>
 <li>Android 6.0 模拟器系统映像(附带 Google API)</li>
 </ul>
 
-
-<a class="online landing-button green download-bundle-button" style="margin-top:30px;" href="#Other">Download</a>
+<a class="online landing-button green download-bundle-button"
+href="#Other" >Download Android Studio<br/><span class='small'></span></a>
 
 <!-- this appears when viewing the offline docs -->
 <p class="offline">
diff --git a/docs/html-intl/intl/zh-cn/sdk/installing/adding-packages.jd b/docs/html-intl/intl/zh-cn/sdk/installing/adding-packages.jd
index 04f55b1..4d5d7ec 100644
--- a/docs/html-intl/intl/zh-cn/sdk/installing/adding-packages.jd
+++ b/docs/html-intl/intl/zh-cn/sdk/installing/adding-packages.jd
@@ -1,7 +1,6 @@
 page.title=添加 SDK 软件包
 
 page.tags=sdk 管理器
-helpoutsWidget=true
 
 @jd:body
 
@@ -31,7 +30,7 @@
   line-height:20px;
   padding:0 0 0 20px;
   margin:0 0 20px 0;
-  display:inline-block;
+  display:inline;
   font-weight:normal;
 }
 ol.large > li:nth-child(1):before {
diff --git a/docs/html-intl/intl/zh-tw/design/index.jd b/docs/html-intl/intl/zh-tw/design/index.jd
deleted file mode 100644
index 43134fc1a8..0000000
--- a/docs/html-intl/intl/zh-tw/design/index.jd
+++ /dev/null
@@ -1,186 +0,0 @@
-page.title=Android 材料設計
-page.tags=Material,design
-page.type=設計
-page.image=images/cads/design-material-for-android_2x.jpg
-
-@jd:body
-
-<!-- developer docs box -->
-<a class="notice-developers right" href="{@docRoot}training/material/index.html">
-  <div>
-    <h3>開發人員文件</h3>
-    <p>使用材料設計建立應用程式</p>
-  </div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=p4gmvHyuZzw">
-<div>
-    <h3>影片</h3>
-    <p>材料設計簡介</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=YaG_ljfzeUw">
-<div>
-    <h3>影片</h3>
-    <p>紙張和墨水:重要的材料</p>
-</div>
-</a>
-
-<!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=XOcCOBe8PTc">
-<div>
-    <h3>影片</h3>
-    <p>Google I/O 應用程式中的材料設計</p>
-</div>
-</a>
-
-
-
-<p itemprop="description">材料設計是一份內容廣泛的綜合性指南,引導您跨平台、跨裝置進行視覺、動態和互動的設計。
-Android 現已納入對材料設計應用程式的支援。
-如果要在 Android 應用程式中使用材料設計,請依照<a href="http://www.google.com/design/spec">材料設計規格</a>中定義的指示,並使用 Android 5.0 (API 級別 21) 或後續版本中的新元件和新功能。
-
-</p>
-
-<p>Android 提供下列元素,供您打造材料設計應用程式:</p>
-
-<ul>
-  <li>新的設計風格</li>
-  <li>用於複雜視圖的小工具</li>
-  <li>自訂陰影和動畫的新 API</li>
-</ul>
-
-<p>如需取得如何在 Android 上實作材料設計的詳細資訊,請參閱<a href="{@docRoot}training/material/index.html">使用材料設計建立應用程式</a>。
-</p>
-
-
-<h3>材料設計風格</h3>
-
-<p>材料設計風格提供您應用程式使用的新樣式、可以讓您設定色板的系統小工具,並針對輕觸回饋與操作行為轉換提供預設動畫。
-</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/MaterialDark.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">深色材料設計風格</p>
-  </div>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/MaterialLight.png" width="500" height="238" />
-  <div style="width:140px;margin:0 auto">
-  <p style="margin-top:8px">淺色材料設計風格</p>
-  </div>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>如需詳細資訊,請參閱<a href="{@docRoot}training/material/theme.html">使用材料設計風格</a>。
-</p>
-
-
-<h3>清單和卡片</h3>
-
-<p>Android 提供兩個新的小工具,搭配材料設計樣式與動畫,可用來顯示清單和卡片:
-</p>
-
-<!-- two columns -->
-<div style="width:700px;margin-top:25px;margin-bottom:20px">
-<div style="float:left;width:250px;margin-left:40px;margin-right:60px;">
-  <img src="{@docRoot}design/material/images/list_mail.png" width="500" height="426" />
-  <p>新的 <code>RecyclerView</code> 小工具是 <code>ListView</code> 更容易插入的版本,支援不同的版面配置類型,並提供效能改善。
-</p>
-</div>
-<div style="float:left;width:250px;margin-right:0px;">
-  <img src="{@docRoot}design/material/images/card_travel.png" width="500" height="426" />
-  <p>新的 <code>CardView</code> 小工具讓您可以顯示卡片內的重要資訊,並且該資訊都能擁有一致的外觀與風格。
-</p>
-</div>
-<br style="clear:left"/>
-</div>
-
-<p>如需詳細資訊,請參閱<a href="{@docRoot}training/material/lists-cards.html">建立清單和卡片</a>。
-</p>
-
-
-<h3>檢視陰影</h3>
-
-<p>除了 X 和 Y 屬性外,Android 中的視圖現在也有 Z 屬性。
-這個新屬性代表視圖的高度,這會決定:</p>
-
-<ul>
-<li>陰影大小:Z 值較高的視圖會投射更大的陰影。</li>
-<li>繪製順序:Z 值較高的視圖會顯示在其他視圖之上。</li>
-</ul>
-
-<div style="width:290px;margin-left:35px;float:right">
-  <div class="framed-nexus5-port-span-5">
-  <video class="play-on-hover" autoplay>
-    <source src="{@docRoot}design/material/videos/ContactsAnim.mp4"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.webm"/>
-    <source src="{@docRoot}design/videos/ContactsAnim.ogv"/>
-  </video>
-  </div>
-  <div style="font-size:10pt;margin-left:20px;margin-bottom:30px">
-    如要重播影片,請按一下裝置螢幕<em></em>
-  </div>
-</div>
-
-<p>如需詳細資訊,請參閱<a href="{@docRoot}training/material/shadows-clipping.html">定義陰影和裁剪視圖</a>。
-</p>
-
-
-<h3>動畫</h3>
-
-<p>新的動畫 API 可針對 UI 控制項的輕觸回饋、視圖狀態中的變更,以及操作行為轉換,讓您建立自訂動畫。
-</p>
-
-<p>這些 API 讓您可以:</p>
-
-<ul>
-<li style="margin-bottom:15px">
-回應您視圖中有<strong>輕觸回饋</strong>動畫的輕觸事件。
-</li>
-<li style="margin-bottom:15px">
-隱藏和顯示有<strong>循環顯示</strong>動畫的視圖。
-</li>
-<li style="margin-bottom:15px">
-在包含自訂<strong>操作行為轉換</strong>動畫的行為間切換。
-</li>
-<li style="margin-bottom:15px">
-使用<strong>曲線動作</strong>建立更自然的動畫。
-</li>
-<li style="margin-bottom:15px">
-在包含<strong>視圖狀態變更</strong>動畫的一個或多個視圖屬性中變更動畫。
-</li>
-<li style="margin-bottom:15px">
-在視圖狀態變更之間,顯示<strong>狀態清單可繪項目</strong>中的動畫。
-</li>
-</ul>
-
-<p>輕觸回饋動畫會內建於數個標準視圖中,例如按鈕等。新 API 可讓您自訂這些動畫,並將其新增至您的自訂視圖中。
-</p>
-
-<p>如需詳細資訊,請參閱<a href="{@docRoot}training/material/animations.html">定義自訂動畫</a>。
-</p>
-
-
-<h3>可繪項目</h3>
-
-<p>可繪項目的這些新功能可以幫助您實作材料設計應用程式:</p>
-
-<ul>
-<li><strong>矢量可繪項目</strong>可以調整大小,但又不會喪失定義,最適合於應用程式中的單色圖示。
-</li>
-<li><strong>繪製著色</strong>可讓您在執行階段將點陣圖定義為 Alpha 遮罩,並以一個顏色進行著色。
-</li>
-<li><strong>顏色提取</strong>可讓您自動從點陣圖影像中提取顯著顏色。
-</li>
-</ul>
-
-<p>如需詳細資訊,請參閱<a href="{@docRoot}training/material/drawables.html">使用可繪項目</a>。
-</p>
diff --git a/docs/html-intl/intl/zh-tw/design/material/index.jd b/docs/html-intl/intl/zh-tw/design/material/index.jd
index ecc2661..464dc2a 100644
--- a/docs/html-intl/intl/zh-tw/design/material/index.jd
+++ b/docs/html-intl/intl/zh-tw/design/material/index.jd
@@ -1,7 +1,6 @@
 page.title=Android 材料設計
-page.tags=Material,design
-page.type=設計
-page.image=mages/cards/design-material-for-android_2x.jpg
+page.tags=Material,design, 設計
+page.image=images/cards/design-material-for-android_2x.jpg
 
 @jd:body
 
@@ -135,12 +134,7 @@
 
 
 <h3>動畫</h3>
-
-<<<<<<< HEAD
 <p>新的動畫 API 可針對 UI 控制項的輕觸回饋、視圖狀態中的變更,以及操作行為轉換,讓您建立自訂動畫。
-=======
-<p>新的動畫 API 可針對 UI 控制項的輕觸回饋、視圖狀態中的變更,以及 Activity 轉換,讓您建立自訂動畫。
->>>>>>> Docs: L10N update for design documentation
 </p>
 
 <p>這些 API 讓您可以:</p>
@@ -153,11 +147,7 @@
 隱藏和顯示有<strong>循環顯示</strong>動畫的視圖。
 </li>
 <li style="margin-bottom:15px">
-<<<<<<< HEAD
 在包含自訂<strong>操作行為轉換</strong>動畫的行為間切換。
-=======
-在包含自訂 <strong>Activity 轉換</strong>動畫的 Activity 間切換。
->>>>>>> Docs: L10N update for design documentation
 </li>
 <li style="margin-bottom:15px">
 使用<strong>曲線動作</strong>建立更自然的動畫。
diff --git a/docs/html-intl/intl/zh-tw/index.jd b/docs/html-intl/intl/zh-tw/index.jd
index cbac617..493283b 100644
--- a/docs/html-intl/intl/zh-tw/index.jd
+++ b/docs/html-intl/intl/zh-tw/index.jd
@@ -5,6 +5,16 @@
 
 @jd:body
 
+<script>
+  $(document).ready(function() {
+    if (useUpdatedTemplates) {
+      $("#useUpdatedTemplates").css("display","block");
+    } else {
+      $("#useOldTemplates").css("display","block");
+    }
+  })
+</script>
+
 <!-- <div class="dac-hero-carousel" data-carousel-query="collection:index/carousel">
 </div> -->
 <section class="dac-hero-carousel">
@@ -39,11 +49,39 @@
 </a>
 </article></section>
 
-<div class="actions-bar dac-expand dac-invert">
+<div id="useUpdatedTemplates" style="display:none" class="dac-section dac-slim dac-gray dac-expand">
   <div class="wrap dac-offset-parent">
     <a class="dac-fab dac-scroll-button" data-scroll-button href="#build-apps">
       <i class="dac-sprite dac-arrow-down-gray"></i>
     </a>
+    <ul class="dac-actions">
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}sdk/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Get the SDK
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}samples/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Browse sample code
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}distribute/stories/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Watch stories
+        </a>
+      </li>
+    </ul>
+  </div><!-- end .wrap -->
+</div><!-- end .dac-actions -->
+
+<div id="useOldTemplates" style="display:none" class="actions-bar dac-expand dac-invert">
+  <div class="wrap dac-offset-parent">
+    <a class="dac-fab dac-scroll-button" data-scroll-button="" href="#build-apps">
+      <i class="dac-sprite dac-arrow-down-gray"></i>
+    </a>
     <div class="actions">
       <div><a href="{@docRoot}sdk/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
@@ -53,17 +91,15 @@
         <span class="dac-sprite dac-auto-chevron-large"></span>
         Browse Samples
       </a></div>
-      <div><a href="//www.youtube.com/user/androiddevelopers">
+      <div><a href="{@docRoot}distribute/stories/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
-        Watch Videos
+        Watch Stories
       </a></div>
     </div><!-- end .actions -->
   </div><!-- end .wrap -->
-</div><!-- end .actions-bar -->
+</div>
 
-
-
-<section class="dac-section dac-section-light" id="build-apps"><div class="wrap">
+<section class="dac-section dac-light" id="build-apps"><div class="wrap">
   <h1 class="dac-section-title">Build Beautiful Apps</h1>
   <div class="dac-section-subtitle">
     Resources to get you started with designing and developing for Android.
diff --git a/docs/html-intl/intl/zh-tw/sdk/index.jd b/docs/html-intl/intl/zh-tw/sdk/index.jd
index a4869d9..aff9d1b 100644
--- a/docs/html-intl/intl/zh-tw/sdk/index.jd
+++ b/docs/html-intl/intl/zh-tw/sdk/index.jd
@@ -1,62 +1,14 @@
 page.title=下載 Android Studio 和 SDK 工具
 page.tags=sdk, android studio
 page.template=sdk
+page.image=images/cards/android-studio_2x.png
 header.hide=1
 page.metaDescription=下載官方 Android IDE 和開發人員工具以建置適用於 Android 手機、平板電腦、穿戴式裝置、電視等裝置的應用程式。
 
-studio.version=1.4.0.10
-
-studio.linux_bundle_download=android-studio-ide-141.2288178-linux.zip
-studio.linux_bundle_bytes=380821638
-studio.linux_bundle_checksum=137e3734f2e8e285bd7c1d2fae2e8548d0f164bd
-
-studio.mac_bundle_download=android-studio-ide-141.2288178-mac.dmg
-studio.mac_bundle_bytes=364624965
-studio.mac_bundle_checksum=27068d59d5a78717d31bdedd054082b5c50d3897
-
-studio.win_bundle_download=android-studio-ide-141.2288178-windows.zip
-studio.win_bundle_bytes=373492997
-studio.win_bundle_checksum=c0851dc9a506ba9f4c1379a3e9b4019c08478220
-
-
-studio.win_bundle_exe_download=android-studio-bundle-141.2288178-windows.exe
-studio.win_bundle_exe_bytes=1177811944
-studio.win_bundle_exe_checksum=a2f0141d35f8f0c24dad2ff390e7f6231c5f7625
-
-studio.win_notools_exe_download=android-studio-ide-141.2288178-windows.exe
-studio.win_notools_exe_bytes=348295968
-studio.win_notools_exe_checksum=82d0d9c78ec23834956f941a07821be347fcb7bf
-
-
-
-
-sdk.linux_download=android-sdk_r24.3.4-linux.tgz
-sdk.linux_bytes=309138331
-sdk.linux_checksum=fb293d7bca42e05580be56b1adc22055d46603dd
-
-sdk.mac_download=android-sdk_r24.3.4-macosx.zip
-sdk.mac_bytes=98340900
-sdk.mac_checksum=128f10fba668ea490cc94a08e505a48a608879b9
-
-sdk.win_download=android-sdk_r24.3.4-windows.zip
-sdk.win_bytes=187496897
-sdk.win_checksum=4a8718fb4a2bf2128d34b92f23ddd79fc65839e7
-
-
-sdk.win_installer=installer_r24.3.4-windows.exe
-sdk.win_installer_bytes=139477985
-sdk.win_installer_checksum=094dd45f98a31f839feae898b48f23704f2878dd
-
-
-
-
-
-
 @jd:body
 
 <style type="text/css">
   .offline {display:none;}
-  a.download-bundle-button {display:block;}
   h2.feature {
     padding-top:30px;
     margin-top:0;
@@ -64,20 +16,7 @@
   }
   .feature-blurb {
   margin:0px; font-size:16px; font-weight:300;
-  padding:40px 0 0 0;
-  }
-
-  .landing-button.green {
-    font-size:16px;
-    background-color:#90c653;
-    padding:8px 10px 10px;
-    margin:0;
-    width:206px;
-    text-align:center;
-  }
-
-  .landing-button.green:hover {
-    background-color:#85b84f;
+  padding-top:40px;
   }
 
   .landing-button .small {
@@ -95,8 +34,8 @@
     white-space: nowrap;
     text-indent: -10000px;
     font-size:0px;
-    background: url(../images/tools/studio-logo.png);
-    background-image: -webkit-image-set(url(../images/tools/studio-logo.png) 1x, url(../images/tools/studio-logo_2x.png) 2x);
+    background: url({@docRoot}images/tools/studio-logo.png);
+    background-image: -webkit-image-set(url({@docRoot}images/tools/studio-logo.png) 1x, url({@docRoot}images/tools/studio-logo_2x.png) 2x);
     background-size: 226px 78px;
   }
 
@@ -292,15 +231,15 @@
 <p style="font-size: 16px; color:#bbb; position: absolute;left: 297px; top: 5px; display: block;
 width: 400px;text-align: center;">官方 Android IDE</p>
 
-<ul style="font-size:12px">
+<ul style="font-size:12px;line-height:19px;">
 <li>Android Studio IDE</li>
 <li>Android SDK 工具</li>
 <li>Android 6.0 (Marshmallow) 平台</li>
 <li>含 Google API 的 Android 6.0 模擬器系統映像檔</li>
 </ul>
 
-
-<a class="online landing-button green download-bundle-button" style="margin-top:30px;" href="#Other">Download</a>
+<a class="online landing-button green download-bundle-button"
+href="#Other" >Download Android Studio<br/><span class='small'></span></a>
 
 <!-- this appears when viewing the offline docs -->
 <p class="offline">
diff --git a/docs/html-intl/intl/zh-tw/sdk/installing/adding-packages.jd b/docs/html-intl/intl/zh-tw/sdk/installing/adding-packages.jd
index 7b4ad0b..563df51 100644
--- a/docs/html-intl/intl/zh-tw/sdk/installing/adding-packages.jd
+++ b/docs/html-intl/intl/zh-tw/sdk/installing/adding-packages.jd
@@ -1,7 +1,6 @@
 page.title=新增 SDK 封裝
 
 page.tags=sdk manager
-helpoutsWidget=true
 
 @jd:body
 
@@ -31,7 +30,7 @@
   line-height:20px;
   padding:0 0 0 20px;
   margin:0 0 20px 0;
-  display:inline-block;
+  display:inline;
   font-weight:normal;
 }
 ol.large > li:nth-child(1):before {
diff --git a/docs/html/about/about_toc.cs b/docs/html/about/about_toc.cs
index eb59b12..a456012 100644
--- a/docs/html/about/about_toc.cs
+++ b/docs/html/about/about_toc.cs
@@ -1,6 +1,5 @@
 <ul id="nav">
-
-    <li class="nav-section">
+  <li class="nav-section">
     <div class="nav-section-header"><a href="<?cs var:toroot ?>about/versions/marshmallow/index.html">
       <span class="en">Marshmallow</span></a></div>
       <ul>
@@ -10,7 +9,6 @@
         Android 6.0 Changes</a></li>
         <li><a href="<?cs var:toroot ?>about/versions/marshmallow/samples.html">
         Android 6.0 Samples</a></li>
-  </li>
       </ul>
   </li>
   <li class="nav-section">
diff --git a/docs/html/about/android.jd b/docs/html/about/android.jd
index ad0ea7c..e3b6958 100644
--- a/docs/html/about/android.jd
+++ b/docs/html/about/android.jd
@@ -26,7 +26,7 @@
 <blockquote>Every day more than a million new Android devices are activated worldwide.</blockquote>
 
 <p>Android’s openness has made it a favorite for consumers and developers alike,
-driving strong growth in app consumption. Android users download more than 
+driving strong growth in app consumption. Android users download 
 billions of apps and games from Google Play each month. </p>
 
 <p>With its partners, Android is continuously pushing the boundaries of hardware and software
@@ -76,7 +76,7 @@
 packaging Android apps. Using the IDE, you can develop on any available Android
 device or create virtual devices that emulate any hardware configuration.</p>
 
-<blockquote>1.5 billion downloads a month and growing. Get your apps in front
+<blockquote>Billion downloads a month and growing. Get your apps in front
 of millions of users at Google's scale.</blockquote>
 
 <h3>Open marketplace for distributing your apps</h3>
@@ -107,5 +107,5 @@
 the best apps promotional slots in curated collections.
 </p>
 
-<p>Preinstalled on hundreds of billions of Android devices around the world,
+<p>Preinstalled on billions of Android devices around the world,
 Google Play can be a growth engine for your business.</p>
\ No newline at end of file
diff --git a/docs/html/about/dashboards/index.jd b/docs/html/about/dashboards/index.jd
index 9274d5d..471dc07 100644
--- a/docs/html/about/dashboards/index.jd
+++ b/docs/html/about/dashboards/index.jd
@@ -1,7 +1,9 @@
 page.title=Dashboards
-page.metaDescription=page.metaDescription=Charts that give you an overview of device characteristics and platform versions that are active in the Android ecosystem.
+page.metaDescription=page.metaDescription=An overview of device characteristics and platform versions that are active in the Android ecosystem.
 page.tags="android, dashboard, platforms, versions"
-meta.tags="ecosystem, versions, whatsnew"
+meta.tags="ecosystem, versions, whatsnew, dashboards"
+page.image=http://chart.googleapis.com/chart?chl=GL%201.1%20only%7CGL%202.0%7CGL%203.0&chf=bg%2Cs%2C00000000&chd=t%3A0.1%2C93.5%2C6.4&chco=c4df9b%2C6fad0c&chs=400x250&cht=p
+
 @jd:body
 
 <style>
diff --git a/docs/html/about/index.jd b/docs/html/about/index.jd
index 215fc3c..22f504e 100644
--- a/docs/html/about/index.jd
+++ b/docs/html/about/index.jd
@@ -119,40 +119,4 @@
 <p>Preinstalled on hundreds of millions of Android devices around the world,
 Google Play can be a growth engine for your business.</p>
 
-<p><a class="landing-page-link" href="{@docRoot}about/start.html">GET STARTED</a></p>
-
-<div style="background: #F0F0F0;
-            border-top: 1px solid #DDD;
-            padding: 20px 0 24px 0;
-            overflow: auto;
-            clear:both;
-            margin-bottom:-10px;
-            margin-top:60px;"">
-   <div style="padding:0 0 0 29px;">
-        <h4>Developer Story: Robot Invader</h4>
-          <img alt="" class="screenshot thumbnail" style="-webkit-border-radius: 5px;
-            -moz-border-radius: 5px;
-            border-radius: 5px height:78px;
-            width: 78px;
-            float: left;
-            margin: 17px 20px 9px 0;" src=
-            "//g0.gstatic.com/android/market/com.robotinvader.knightmare/hi-256-0-9e08d83bc8d01649e167131d197ada1cd1783fb0">
-          <div style="width:700px;">
-          <p style="margin-top:26px;margin-bottom:12px;">Robot Invader chose 
-              Android as the launch platform for their first game, 
-              <a data-g-event="Developers Page" data-g-label="Case Study Link" href=
-              "//play.google.com/store/apps/details?id=com.robotinvader.knightmare"><em>Wind-up
-              Knight</em></a>.
-           </p>
-           <p>
-              Hear from the developers themselves how Android helped them reach more
-              than 100 devices with a single app binary, then iterate rapidly to ensure
-              a great experience for users.
-           </p>
-           </div>
-           <iframe style="float:left;
-             margin-right:24px;
-             margin-top:14px;" width="700" height="394" src=
-             "http://www.youtube.com/embed/hTtlLiUTowY" frameborder="0" allowfullscreen></iframe>
-   </div> 
-</div>
\ No newline at end of file
+<p><a class="landing-page-link" href="{@docRoot}about/start.html">GET STARTED</a></p>
\ No newline at end of file
diff --git a/docs/html/about/versions/kitkat.jd b/docs/html/about/versions/kitkat.jd
index dff3508..2987bd4 100644
--- a/docs/html/about/versions/kitkat.jd
+++ b/docs/html/about/versions/kitkat.jd
@@ -58,11 +58,10 @@
     <img src="{@docRoot}images/kk-devices.png" alt="Android 4.4 on phone and tablet" width="380">
   </div>
 
-  <div class="landing-docs" style="float:right;clear:both;margin:22px 0 2em 3em;">
-  <div class="col-4 normal-links highlights" style="font-size:12px;">
-    <h3 id="thisd" >Key Developer Features</h3>
+<div id="qv-wrapper">
+  <div id="qv">
+    <h2 id="features" >Key Developer Features</h3>
     <ul style="list-style-type:none;">
-      <!--<li><a href="#44-ui">UI refresh</a></li>-->
       <li><a href="#44-hce">Host Card Emulation</a></li>
       <li><a href="#44-printing">Printing framework</a></li>
       <li><a href="#44-storage-access">Storage access framework</a></li>
diff --git a/docs/html/about/versions/marshmallow/android-6.0-changes.jd b/docs/html/about/versions/marshmallow/android-6.0-changes.jd
index bae4717..f998590 100644
--- a/docs/html/about/versions/marshmallow/android-6.0-changes.jd
+++ b/docs/html/about/versions/marshmallow/android-6.0-changes.jd
@@ -346,8 +346,8 @@
   Owners have the privilege of editing or removing any Wi-Fi configurations, including
   those not created by them.
   </li>
-<li><strong>Download Work Policy Controller via Google account addition:</strong> When a Google
-account that requires management via a Work Policy Controller (WPC) app is added to a device
+<li><strong>Download device policy controller via Google account addition:</strong> When a Google
+account that requires management via a device policy controller (DPC) app is added to a device
 outside of a managed context, the add account flow now prompts the user to install the
 appropriate WPC. This behavior also applies to accounts added via
 <strong>Settings > Accounts</strong> and in the initial device setup wizard.</li>
diff --git a/docs/html/about/versions/marshmallow/android-6.0.jd b/docs/html/about/versions/marshmallow/android-6.0.jd
index 732932f..779ecf4 100644
--- a/docs/html/about/versions/marshmallow/android-6.0.jd
+++ b/docs/html/about/versions/marshmallow/android-6.0.jd
@@ -553,7 +553,7 @@
 update, for instance in the case of a kiosk device, or postpone the update and prevent it being
 taken by the user for up to 30 days. Furthermore, an administrator can set a daily time window in
 which an update must be taken, for example during the hours when a kiosk device is not in use. When
-a system update is available, the system checks if the Work Policy Controller app has set a system
+a system update is available, the system checks if the device policy controller app has set a system
 update policy, and behaves accordingly.
 </li>
 <li>
diff --git a/docs/html/about/versions/marshmallow/index.jd b/docs/html/about/versions/marshmallow/index.jd
index a7bca56..35edd72 100644
--- a/docs/html/about/versions/marshmallow/index.jd
+++ b/docs/html/about/versions/marshmallow/index.jd
@@ -2,7 +2,8 @@
 page.tags="marshmallow"
 meta.tags="marshamallow","android60"
 fullpage=true
-section.landing=true
+nonavpage=true
+forcelocalnav=true
 header.hide=1
 footer.hide=1
 @jd:body
@@ -55,6 +56,7 @@
   <div class="resource-widget resource-flow-layout col-16"
        data-query="collection:marshmallow/landing/more"
        data-cardSizes="6x6"
+       data-items-per-page="15"
        data-initial-results="3"></div>
   </div>
 </section>
@@ -68,17 +70,19 @@
   <div class="resource-widget resource-flow-layout col-16"
        data-query="collection:marshmallow/landing/videos"
        data-cardSizes="6x6"
+       data-items-per-page="15"
        data-initial-results="6"></div>
   </div>
 </section>
 
-<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">
+<section class="dac-section dac-gray dac-small" id="latest"><div class="wrap">
   <h2 class="norule">Latest</h2>
   <div class="resource-widget resource-flow-layout col-16"
       data-query="type:blog+tag:marshmallow"
       data-sortOrder="-timestamp"
       data-cardSizes="6x6"
-      data-maxResults="12"
+      data-maxResults="24"
+      data-items-per-page="15"
       data-initial-results="3">
   </div>
 </section>
diff --git a/docs/html/auto/images/ui/gearhead_custom_UI.png b/docs/html/auto/images/ui/gearhead_custom_UI.png
index a3baba4..fce7eb8 100644
--- a/docs/html/auto/images/ui/gearhead_custom_UI.png
+++ b/docs/html/auto/images/ui/gearhead_custom_UI.png
Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_custom_user_actions.png b/docs/html/auto/images/ui/gearhead_custom_user_actions.png
index 8e65ee04..5aedbb9 100644
--- a/docs/html/auto/images/ui/gearhead_custom_user_actions.png
+++ b/docs/html/auto/images/ui/gearhead_custom_user_actions.png
Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_day.png b/docs/html/auto/images/ui/gearhead_day.png
index a3baba4..5593caa 100644
--- a/docs/html/auto/images/ui/gearhead_day.png
+++ b/docs/html/auto/images/ui/gearhead_day.png
Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_drawer_generic.png b/docs/html/auto/images/ui/gearhead_drawer_generic.png
index 94dd305..1d6fc85 100644
--- a/docs/html/auto/images/ui/gearhead_drawer_generic.png
+++ b/docs/html/auto/images/ui/gearhead_drawer_generic.png
Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_drawers_customized.png b/docs/html/auto/images/ui/gearhead_drawers_customized.png
index fe74a49..308e8cf 100644
--- a/docs/html/auto/images/ui/gearhead_drawers_customized.png
+++ b/docs/html/auto/images/ui/gearhead_drawers_customized.png
Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_generic_UI.png b/docs/html/auto/images/ui/gearhead_generic_UI.png
index d7cd53d..cd51929 100644
--- a/docs/html/auto/images/ui/gearhead_generic_UI.png
+++ b/docs/html/auto/images/ui/gearhead_generic_UI.png
Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_lens_switching.png b/docs/html/auto/images/ui/gearhead_lens_switching.png
index 9fb8b65..39e4bc6 100644
--- a/docs/html/auto/images/ui/gearhead_lens_switching.png
+++ b/docs/html/auto/images/ui/gearhead_lens_switching.png
Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_night.png b/docs/html/auto/images/ui/gearhead_night.png
index 8f1ecdd..424df16 100644
--- a/docs/html/auto/images/ui/gearhead_night.png
+++ b/docs/html/auto/images/ui/gearhead_night.png
Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_overview.png b/docs/html/auto/images/ui/gearhead_overview.png
index 00b35ce..21948f7 100644
--- a/docs/html/auto/images/ui/gearhead_overview.png
+++ b/docs/html/auto/images/ui/gearhead_overview.png
Binary files differ
diff --git a/docs/html/auto/index.jd b/docs/html/auto/index.jd
index 2f0ffd5..cc5ed2e 100644
--- a/docs/html/auto/index.jd
+++ b/docs/html/auto/index.jd
@@ -619,25 +619,6 @@
         </div>
       </div>
   </div>
-  <div class="content-footer wrap" itemscope="" itemtype="http://schema.org/SiteNavigationElement"
-    style="border-top: none;">
-
-    <div class="layout-content-col col-16" style="padding-top:4px">
-      <style>#___plusone_0 {float:right !important;}</style>
-      <div class="g-plusone" data-size="medium"></div>
-    </div>
-  </div>
-
-  <div id="footer" class="wrap" style="width:940px;position:relative;top:-35px;z-index:-1">
-    <div id="copyright">
-        Except as noted, this content is
-        licensed under <a href="http://creativecommons.org/licenses/by/2.5/">
-        Creative Commons Attribution 2.5</a>. For details and
-        restrictions, see the <a href="{@docRoot}license.html">Content
-        License</a>.
-    </div>
-  </div>
-</div> <!-- end .landing-hero-container -->
 
   <script>
   $("a.landing-down-arrow").on("click", function(e) {
diff --git a/docs/html/design/design_toc.cs b/docs/html/design/design_toc.cs
index 2dda87e8..a837a04 100644
--- a/docs/html/design/design_toc.cs
+++ b/docs/html/design/design_toc.cs
@@ -18,15 +18,10 @@
 
   <li class="nav-section">
     <div class="nav-section-header empty"><a href="<?cs var:toroot ?>design/material/index.html"
-       es-lang="Material Design"
        ja-lang="マテリアル デザイン"
        ko-lang="머티어리얼 디자인"
-       pt-br-lang="Material Design"
-       ru-lang="Material Design"
        zh-cn-lang="材料设计"
        zh-tw-lang="材料設計"
-       in-lang="Desain Bahan"
-       vi-lang="Material Design"
        >
     Material for Android</a></div>
   </li>
@@ -62,10 +57,9 @@
   </li>
 
   <li class="nav-section">
-    <div class="nav-section-header"><a href="<?cs var:toroot ?>design/style/index.html">Pure Android</a></div>
+    <div class="nav-section-header"><a href="<?cs var:toroot ?>design/patterns/index.html">Pure Android</a></div>
     <ul>
       <li><a href="<?cs var:toroot ?>design/style/devices-displays.html">Devices and Displays</a></li>
-      <li><a href="<?cs var:toroot ?>design/patterns/app-structure.html">App Structure</a></li>
       <li><a href="<?cs var:toroot ?>design/patterns/navigation.html"
        es-lang="Navegación con los botones Back y Up"
        ja-lang="Back と Up を使用したナビゲーション"
@@ -88,7 +82,6 @@
       <li><a href="<?cs var:toroot ?>design/patterns/widgets.html">Widgets</a></li>
       <li><a href="<?cs var:toroot ?>design/patterns/swipe-views.html">Swipe Views</a></li>
       <li><a href="<?cs var:toroot ?>design/patterns/fullscreen.html">Full Screen</a></li>
-
       <li><a href="<?cs var:toroot ?>design/patterns/confirming-acknowledging.html"
        es-lang="Confirmación y reconocimiento"
        ja-lang="確認と通知"
@@ -98,7 +91,6 @@
        zh-cn-lang="确认和确知"
        zh-tw-lang="確認及確認完成">
        Confirming &amp; Acknowledging</a></li>
-
       <li><a href="<?cs var:toroot ?>design/patterns/pure-android.html">Pure Android</a></li>
       <li><a href="<?cs var:toroot ?>design/patterns/compatibility.html">Compatibility</a></li>
       <li><a href="<?cs var:toroot ?>design/patterns/accessibility.html">Accessibility</a></li>
diff --git a/docs/html/design/devices.jd b/docs/html/design/devices.jd
index 3d23d07..4616836 100644
--- a/docs/html/design/devices.jd
+++ b/docs/html/design/devices.jd
@@ -1,7 +1,5 @@
 page.title=Android devices
-page.viewport_width=970
 section.landing=true
-header.hide=1
 footer.hide=1
 page.image=images/cards/android-devices_2x.jpg
 @jd:body
diff --git a/docs/html/design/downloads/index.jd b/docs/html/design/downloads/index.jd
index 089a4af..e37b305 100644
--- a/docs/html/design/downloads/index.jd
+++ b/docs/html/design/downloads/index.jd
@@ -1,8 +1,11 @@
 page.title=Downloads
-page.tags=Icons,stencils,color swatches
+page.tags="icons","stencils","colors,"swatches"
+meta.tags="downloads, design, tools"
+section.landing=true
+footer.hide=true
+nonavpage=true
+forcelocalnav=true
 @jd:body
-
-
 <p>For icons, sticker sheets, and other downloadable resources, visit the
 <a href="http://www.google.com/design">Design site</a> or use the links below. </p>
 
diff --git a/docs/html/design/get-started/creative-vision.jd b/docs/html/design/get-started/creative-vision.jd
index 974d5d0..26bc1b2 100644
--- a/docs/html/design/get-started/creative-vision.jd
+++ b/docs/html/design/get-started/creative-vision.jd
@@ -1,8 +1,11 @@
 page.title=Creative Vision
+section.landing=true
+footer.hide=1
 page.image=images/cards/design-creative-vision_2x.jpg
+
 @jd:body
 
-<img src="{@docRoot}design/media/creative_vision_main.png">
+<img src="{@docRoot}design/media/creative_vision_main.png" style="width:100%;margin-top:">
 
 <div class="vspace size-1">&nbsp;</div>
 
@@ -15,7 +18,7 @@
 <div class="vspace size-1">&nbsp;</div>
 
 <div class="cols">
-  <div class="col-4">
+  <div class="col-1of3">
 
 <h4>Enchant me</h4>
 <p>Beauty is more than skin deep. Android apps are sleek and aesthetically pleasing on multiple levels.
@@ -24,7 +27,7 @@
 simplicity and purpose to create a magical experience that is effortless and powerful.</p>
 
   </div>
-  <div class="col-5">
+  <div class="col-1of3">
 
 <h4>Simplify my life</h4>
 <p>Android apps make life easier and are easy to understand. When people use your app for the first
@@ -35,7 +38,7 @@
 irrelevant flash.</p>
 
   </div>
-  <div class="col-4">
+  <div class="col-1of3">
 
 <h4>Make me amazing</h4>
 <p>It's not enough to make an app that is easy to use. Android apps empower people to try new things
diff --git a/docs/html/design/get-started/principles.jd b/docs/html/design/get-started/principles.jd
index 172a4e4..9e8a371 100644
--- a/docs/html/design/get-started/principles.jd
+++ b/docs/html/design/get-started/principles.jd
@@ -15,7 +15,7 @@
 <h2 id="enchant-me">Enchant Me</h2>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="delight-me">Delight me in surprising ways</h4>
 <p>A beautiful surface, a carefully-placed animation, or a well-timed sound effect is a joy to
@@ -23,7 +23,7 @@
 force is at hand.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_delight.png">
 
@@ -33,14 +33,14 @@
 <div class="vspace size-2">&nbsp;</div>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="real-objects-more-fun">Real objects are more fun than buttons and menus</h4>
 <p>Allow people to directly touch and manipulate objects in your app. It reduces the cognitive effort
 needed to perform a task while making it more emotionally satisfying.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_real_objects.png">
 
@@ -50,7 +50,7 @@
 <div class="vspace size-2">&nbsp;</div>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="make-it-mine">Let me make it mine</h4>
 <p>People love to add personal touches because it helps them feel at home and in control. Provide
@@ -58,7 +58,7 @@
 primary tasks.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_make_it_mine.png">
 
@@ -68,14 +68,14 @@
 <div class="vspace size-2">&nbsp;</div>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="get-to-know-me">Get to know me</h4>
 <p>Learn peoples' preferences over time. Rather than asking them to make the same choices over and
 over, place previous choices within easy reach.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_get_to_know_me.png">
 
@@ -85,13 +85,13 @@
 <h2 id="simplify-my-life">Simplify My Life</h2>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="keep-it-brief">Keep it brief</h4>
 <p>Use short phrases with simple words. People are likely to skip sentences if they're long.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_keep_it_brief.png">
 
@@ -101,14 +101,14 @@
 <div class="vspace size-2">&nbsp;</div>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="pictures-faster-than-words">Pictures are faster than words</h4>
 <p>Consider using pictures to explain ideas. They get people's attention and can be much more efficient
 than words.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_pictures.png">
 
@@ -118,14 +118,14 @@
 <div class="vspace size-2">&nbsp;</div>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="decide-for-me">Decide for me but let me have the final say</h4>
 <p>Take your best guess and act rather than asking first. Too many choices and decisions make people
 unhappy. Just in case you get it wrong, allow for 'undo'.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_decide_for_me.png">
 
@@ -135,14 +135,14 @@
 <div class="vspace size-2">&nbsp;</div>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="only-show-when-i-need-it">Only show what I need when I need it</h4>
 <p>People get overwhelmed when they see too much at once. Break tasks and information into small,
 digestible chunks. Hide options that aren't essential at the moment, and teach people as they go.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_information_when_need_it.png">
 
@@ -152,14 +152,14 @@
 <div class="vspace size-2">&nbsp;</div>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="always-know-where-i-am">I should always know where I am</h4>
 <p>Give people confidence that they know their way around. Make places in your app look distinct and
 use transitions to show relationships among screens. Provide feedback on tasks in progress.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_navigation.png">
 
@@ -169,7 +169,7 @@
 <div class="vspace size-2">&nbsp;</div>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="never-lose-my-stuff">Never lose my stuff</h4>
 <p>Save what people took time to create and let them access it from anywhere. Remember settings,
@@ -177,7 +177,7 @@
 easiest thing in the world.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_never_lose_stuff.png">
 
@@ -187,14 +187,14 @@
 <div class="vspace size-2">&nbsp;</div>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="looks-same-should-act-same">If it looks the same, it should act the same</h4>
 <p>Help people discern functional differences by making them visually distinct rather than subtle.
 Avoid modes, which are places that look similar but act differently on the same input.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_looks_same.png">
 
@@ -204,14 +204,14 @@
 <div class="vspace size-2">&nbsp;</div>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="interrupt-only-if-important">Only interrupt me if it's important</h4>
 <p>Like a good personal assistant, shield people from unimportant minutiae. People want to stay
 focused, and unless it's critical and time-sensitive, an interruption can be taxing and frustrating.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_important_interruption.png">
 
@@ -221,7 +221,7 @@
 <h2 id="make-me-amazing">Make Me Amazing</h2>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="give-me-tricks">Give me tricks that work everywhere</h4>
 <p>People feel great when they figure things out for themselves. Make your app easier to learn by
@@ -229,7 +229,7 @@
 may be a good navigational shortcut.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_tricks.png">
 
@@ -239,7 +239,7 @@
 <div class="vspace size-2">&nbsp;</div>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="its-not-my-fault">It's not my fault</h4>
 <p>Be gentle in how you prompt people to make corrections. They want to feel smart when they use your
@@ -247,7 +247,7 @@
 If you can fix it behind the scenes, even better.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_error.png">
 
@@ -257,14 +257,14 @@
 <div class="vspace size-2">&nbsp;</div>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="sprinkle-encouragement">Sprinkle encouragement</h4>
 <p>Break complex tasks into smaller steps that can be easily accomplished. Give feedback on actions,
 even if it's just a subtle glow.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_sprinkle_encouragement.png">
 
@@ -274,7 +274,7 @@
 <div class="vspace size-2">&nbsp;</div>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="do-heavy-lifting-for-me">Do the heavy lifting for me</h4>
 <p>Make novices feel like experts by enabling them to do things they never thought they could. For
@@ -282,7 +282,7 @@
 only a few steps.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_heavy_lifting.png">
 
@@ -292,14 +292,14 @@
 <div class="vspace size-2">&nbsp;</div>
 
 <div class="cols">
-  <div class="col-7">
+  <div class="col-7of12">
 
 <h4 id="make-important-things-fast">Make important things fast</h4>
 <p>Not all actions are equal. Decide what's most important in your app and make it easy to find and
 fast to use, like the shutter button in a camera, or the pause button in a music player.</p>
 
   </div>
-  <div class="col-6">
+  <div class="col-5of12">
 
     <img src="{@docRoot}design/media/principles_make_important_fast.png">
 
diff --git a/docs/html/design/index.jd b/docs/html/design/index.jd
index 799a64f..5ea1244 100644
--- a/docs/html/design/index.jd
+++ b/docs/html/design/index.jd
@@ -1,8 +1,8 @@
 fullpage=true
 page.title=Design
-page.viewport_width=970
 section.landing=true
 meta.tags="beautifulapps, design, ux, patterns, holo, appquality, landing"
+page.metaDescription=Create beautiful experiences in your apps.
 header.hide=1
 footer.hide=1
 @jd:body
@@ -46,7 +46,7 @@
     <i class="dac-sprite dac-arrow-down-gray"></i>
   </a>
 </div>
-<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">
+<section class="dac-section dac-gray dac-small" id="latest"><div class="wrap">
   <h2 class="norule">Latest</h2>
   <div class="resource-widget resource-flow-layout col-16"
        data-query="collection:design/landing/latest"
diff --git a/docs/html/design/material/index.jd b/docs/html/design/material/index.jd
index c5893a7..701c951 100644
--- a/docs/html/design/material/index.jd
+++ b/docs/html/design/material/index.jd
@@ -1,8 +1,8 @@
 page.title=Material Design for Android
 page.tags=Material,design
-page.type=design
 page.image=images/cards/design-material-for-android_2x.jpg
-
+footer.hide=true
+forcelocalnav=true
 @jd:body
 
 <!-- developer docs box -->
diff --git a/docs/html/design/patterns/index.jd b/docs/html/design/patterns/index.jd
new file mode 100644
index 0000000..01e5c0d
--- /dev/null
+++ b/docs/html/design/patterns/index.jd
@@ -0,0 +1,29 @@
+page.title=Pure Android
+footer.hide=1
+@jd:body
+
+<style>
+#landing-graphic-container {
+  position: relative;
+}
+
+#text-overlay {
+  position: absolute;
+  left: 0;
+  top: 402px;
+  width: 220px;
+}
+</style>
+
+<div id="landing-graphic-container">
+  <div id="text-overlay">
+    <span itemprop="description">Build visually compelling apps that look great on any
+    device.</span>
+    <br><br>
+    <a href="{@docRoot}design/style/devices-displays.html" class="landing-page-link">Devices and Displays</a>
+  </div>
+
+  <a href="{@docRoot}design/style/devices-displays.html">
+    <img src="{@docRoot}design/media/design_elements_landing.png">
+  </a>
+</div>
diff --git a/docs/html/design/patterns/notifications.jd b/docs/html/design/patterns/notifications.jd
index fdd435c..844c3b6 100644
--- a/docs/html/design/patterns/notifications.jd
+++ b/docs/html/design/patterns/notifications.jd
@@ -1,22 +1,22 @@
 page.title=Notifications
-page.tags="notifications","design","L"
+page.tags="notifications","design"
 @jd:body
 
-  <a class="notice-developers" href="{@docRoot}training/notify-user/index.html">
+  <a class="notice-developers right" href="{@docRoot}training/notify-user/index.html">
   <div>
     <h3>Developer Docs</h3>
     <p>Notifying the User</p>
   </div>
 </a>
 
-<a class="notice-designers" href="notifications_k.html">
+<a class="notice-designers right" href="notifications_k.html">
   <div>
     <h3>Notifications in Android 4.4 and Lower</h3>
   </div>
 </a>
 
 <!-- video box -->
-<a class="notice-developers-video" href="https://www.youtube.com/watch?v=Uiq2kZ2JHVY">
+<a class="notice-developers-video right" href="https://www.youtube.com/watch?v=Uiq2kZ2JHVY">
 <div>
     <h3>Video</h3>
     <p>DevBytes: Notifications in the Android L Developer Preview</p>
diff --git a/docs/html/design/patterns/notifications_k.jd b/docs/html/design/patterns/notifications_k.jd
index 01a12a7..39ee269 100644
--- a/docs/html/design/patterns/notifications_k.jd
+++ b/docs/html/design/patterns/notifications_k.jd
@@ -1,14 +1,15 @@
-page.title=Notifications in Android 4.4 and Lower
+page.title=Notifications, Android 4.4 and Lower
+footer.hide=1
 @jd:body
 
-<a class="notice-developers" href="{@docRoot}training/notify-user/index.html">
+<a class="notice-developers right" href="{@docRoot}training/notify-user/index.html">
   <div>
     <h3>Developer Docs</h3>
     <p>Notifying the User</p>
   </div>
 </a>
 
-<a class="notice-designers" href="notifications.html">
+<a class="notice-designers right" href="notifications.html">
   <div>
     <h3>Notifications in Android 5.0</h3>
   </div>
diff --git a/docs/html/design/patterns/swipe-views.jd b/docs/html/design/patterns/swipe-views.jd
index 9ee33db..789538d 100644
--- a/docs/html/design/patterns/swipe-views.jd
+++ b/docs/html/design/patterns/swipe-views.jd
@@ -2,7 +2,7 @@
 page.tags=viewpager,navigation,tabs
 @jd:body
 
-<a class="notice-developers" href="{@docRoot}training/implementing-navigation/lateral.html">
+<a class="notice-developers right" href="{@docRoot}training/implementing-navigation/lateral.html">
   <div>
     <h3>Developer Docs</h3>
     <p>Creating Swipe Views with Tabs</p>
@@ -20,7 +20,7 @@
 related data items, such as images, chats, or emails, and then pick one of the items to see the
 detail contents in a separate screen.</p>
 
-<img src="{@docRoot}design/media/swipe_views.png">
+<img itemprop="image" src="{@docRoot}design/media/swipe_views.png">
 <div class="figure-caption">
   Master (left) and detail (right) views.
 </div>
diff --git a/docs/html/design/patterns/widgets.jd b/docs/html/design/patterns/widgets.jd
index d84d289a..8d94a52 100644
--- a/docs/html/design/patterns/widgets.jd
+++ b/docs/html/design/patterns/widgets.jd
@@ -3,13 +3,6 @@
 page.metaDescription=Design guide to creating widgets that are easy to use and look great.
 @jd:body
 
-<a class="notice-developers" href="{@docRoot}guide/topics/appwidgets/index.html">
-  <div>
-    <h3>Developer Docs</h3>
-    <p>App Widgets</p>
-  </div>
-</a>
-
 <p itemprop="description">Widgets are an essential aspect of home screen customization. You can imagine them as "at-a-glance" views of an app's most important data and functionality that is accessible right from the user's home screen. Users can move widgets across their home screen panels, and, if supported, resize them to tailor the amount of information within a widget to their preference.</p>
 
 <h2>Widget types</h2>
diff --git a/docs/html/design/style/devices-displays.jd b/docs/html/design/style/devices-displays.jd
index caa77da..9edfadd 100644
--- a/docs/html/design/style/devices-displays.jd
+++ b/docs/html/design/style/devices-displays.jd
@@ -3,15 +3,7 @@
 
 @jd:body
 
-<a class="notice-designers-material"
-  href="http://www.google.com/design/spec/layout/principles.html">
-  <div>
-    <h3>Material Design</h3>
-    <p>Layout Principles<p>
-  </div>
-</a>
-
-<p>Android powers hundreds of millions of phones, tablets, and other devices in a wide variety of screen sizes and
+<p>Android powers more than a billion phones, tablets, and other devices in a wide variety of screen sizes and
 form factors. By taking advantage of Android's flexible layout system, you can create apps that
 gracefully scale from large tablets to smaller phones.</p>
 
diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd
index 4591e76..3b29318 100644
--- a/docs/html/develop/index.jd
+++ b/docs/html/develop/index.jd
@@ -13,15 +13,14 @@
   <div class="wrap">
     <div class="cols dac-hero-content">
       <div class="col-1of2 col-push-1of2 dac-hero-figure">
-
+        <!--
         <iframe width="448" height="252"
             src="//www.youtube.com/embed/Z98hXV9GmzY?autohide=1&amp;showinfo=0"
             frameborder="0" allowfullscreen=""
             style="float: right;"></iframe>
-        <!--
+        -->
         <img class="dac-hero-image" src="{@docRoot}images/develop/hero_image_studio5_2x.png"
           srcset="/images/develop/hero_image_studio5.png 1x, /images/develop/hero_image_studio5_2x.png 2x" />
-        -->
       </div>
       <div class="col-1of2 col-pull-1of2">
         <h1 class="dac-hero-title">Get Started with Android Studio</h1>
@@ -60,15 +59,16 @@
   </a>
 </div>
 
-<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">
+<section class="dac-section dac-gray dac-small" id="latest"><div class="wrap">
   <h2 class="norule">Latest</h2>
   <div class="resource-widget resource-flow-layout col-16"
-       data-query="type:youtube+tag:develop+tag:featured, type:blog+tag:develop+tag:featured"
-       data-query="collection:develop/landing/latest"
-       data-sortOrder="-timestamp"
-       data-cardSizes="6x6"
-       data-maxResults="12"
-       data-initial-results="3"></div>
+    data-query="type:youtube+tag:develop+tag:featured, type:blog+tag:develop+tag:featured"
+    data-query="collection:develop/landing/latest"
+    data-sortOrder="-timestamp"
+    data-cardSizes="6x6"
+    data-items-per-page="6"
+    data-maxResults="15"
+    data-initial-results="3"></div>
 </div></section>
 
 <section class="dac-section dac-light"><div class="wrap">
@@ -81,6 +81,7 @@
        data-cardSizes="6x6"
        data-maxResults="15"
        data-initial-results="3"
+       data-items-per-page="6"
        data-sortOrder="random"></div>
 </div></section>
 
@@ -152,5 +153,6 @@
        data-sortOrder="random"
        data-cardSizes="6x6"
        data-initial-results="6"
+       data-items-per-page="24"
        data-maxResults="24"></div>
 </div></section>
diff --git a/docs/html/distribute/analyze/start.jd b/docs/html/distribute/analyze/start.jd
index c3a1f87..0221f72 100644
--- a/docs/html/distribute/analyze/start.jd
+++ b/docs/html/distribute/analyze/start.jd
@@ -1,5 +1,5 @@
 page.title=Get Started with Analytics
-page.metaDescription=Unlock the power of Analytics by choosing the implementation that works best for your app.
+page.metaDescription=Get advanced insight into how players discover and play your games.
 page.tags="analytics, user behavior"
 page.image=images/cards/card-analytics_2x.png
 
diff --git a/docs/html/distribute/engage/game-services.jd b/docs/html/distribute/engage/game-services.jd
index 9ca27b7..4a22035 100644
--- a/docs/html/distribute/engage/game-services.jd
+++ b/docs/html/distribute/engage/game-services.jd
@@ -186,7 +186,7 @@
 </div>
 
 <div class="resource-widget resource-flow-layout col-13"
-  data-query="collection:distribute/engage/gamesservices/related"
+  data-query="collection:distribute/engage/googleplaygames"
   data-sortOrder="-timestamp"
   data-cardSizes="9x3"
   data-maxResults="6"></div>
diff --git a/docs/html/distribute/essentials/index.jd b/docs/html/distribute/essentials/index.jd
index 6185e54..636c11d 100644
--- a/docs/html/distribute/essentials/index.jd
+++ b/docs/html/distribute/essentials/index.jd
@@ -1,5 +1,5 @@
 page.title=Essentials for a Successful App
-meta.tags="landing, quality"
+meta.tags="guidelines, quality"
 page.tags="guidelines", "tablet", "quality"
 section.landing=true
 nonavpage=true
@@ -12,21 +12,23 @@
   process of monitoring feedback and making improvement after launch.
 </p>
 
-<h2 id="guidelines">Quality Guidelines</h2>
+<section class="dac-section dac-small" id="latest-games"><div class="wrap">
+<h2 id="guidelines" class="norule">Quality Guidelines</h2>
 
 <div class="resource-widget resource-flow-layout landing col-16"
   data-query="collection:distribute/essentials/guidelines"
   data-cardSizes="6x6"
   data-maxResults="9">
-</div>
+</div></div></section>
 
-<h2 id="tools">Tools &amp; Resources</h2>
+<section class="dac-section dac-small" id="latest-games"><div class="wrap">
+<h2 id="tools" class="norule">Tools &amp; Resources</h2>
 
 <div class="resource-widget resource-flow-layout landing col-16"
   data-query="collection:distribute/essentials/tools"
   data-cardSizes="6x6"
   data-maxResults="9">
-</div>
+</div></div></section>
 
 <!-- <h2>Related resources</h2>
 
diff --git a/docs/html/distribute/googleplay/cardboard.jd b/docs/html/distribute/googleplay/cardboard.jd
index d5965d1..8d21c2f 100644
--- a/docs/html/distribute/googleplay/cardboard.jd
+++ b/docs/html/distribute/googleplay/cardboard.jd
@@ -1,6 +1,7 @@
 page.title=Build VR with Google Cardboard
 page.metaDescription=Build apps and games with VR, for a viewer anyone can buy.
-page.tags=vr, carboard, games
+page.tags=vr, cardboard, games
+page.image=images/cards/card-cardboard_2x.png
 @jd:body
 
 <p>
diff --git a/docs/html/distribute/googleplay/index.jd b/docs/html/distribute/googleplay/index.jd
index 3b5966f..c69ce23 100644
--- a/docs/html/distribute/googleplay/index.jd
+++ b/docs/html/distribute/googleplay/index.jd
@@ -11,22 +11,24 @@
   help you gain traction in the marketplace.</span>
 </p>
 
-  <h2>Overview</h2>
+  <section class="dac-section dac-small" id="latest-games"><div class="wrap">
+  <h2 class="norule">Overview</h2>
 
   <div class="resource-widget resource-flow-layout landing col-16"
     data-query="collection:distribute/gp/gplanding"
     data-sortOrder="-timestamp"
     data-cardSizes="6x6"
     data-maxResults="3">
-  </div>
+    </div></div></section>
 
-  <h2 id="opportunities">Opportunities &amp; Programs</h2>
+  <section class="dac-section dac-small" id="latest-games"><div class="wrap">
+  <h2 id="opportunities" class="norule">Opportunities &amp; Programs</h2>
 
   <div class="resource-widget resource-flow-layout landing col-16"
     data-query="collection:distribute/gp/gpfelanding"
     data-cardSizes="6x6"
     data-maxResults="10">
-  </div>
+  </div></div></section>
 
 <!--  <h2>Related resources</h2>
 
diff --git a/docs/html/distribute/index.jd b/docs/html/distribute/index.jd
index a6ece63..6384773 100644
--- a/docs/html/distribute/index.jd
+++ b/docs/html/distribute/index.jd
@@ -1,5 +1,6 @@
 fullpage=true
 page.title=Distribute Your Apps
+page.image=images/distribute/google-play-bg.jpg
 page.viewport_width=970
 section.landing=true
 header.hide=1
@@ -7,6 +8,17 @@
 page.metaDescription=The most visited store in the world for Android apps. Cloud-connected and always synced, it's never been easier for users to find and download your apps.
 
 @jd:body
+
+<script>
+  $(document).ready(function() {
+    if (useUpdatedTemplates) {
+      $("#useUpdatedTemplates").css("display","block");
+    } else {
+      $("#useOldTemplates").css("display","block");
+    }
+  })
+</script>
+
 <div class="dac-hero-carousel" data-carousel-query="collection:distribute/landing/carousel">
 </div>
 
@@ -16,16 +28,64 @@
   </a>
 </div>
 
-<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">
+<section id="useOldTemplates" style="display:none" class="dac-section dac-gray dac-small" id="latest"><div class="wrap">
   <h2 class="norule">Latest</h2>
   <div class="resource-widget resource-flow-layout col-16"
       data-query="type:youtube+tag:googleplay+tag:developerstory+tag:featured, type:blog+tag:googleplay+tag:distribute+tag:featured"
       data-sortOrder="-timestamp"
       data-cardSizes="6x6"
-      data-maxResults="12"
+      data-maxResults="3"
+      data-items-per-page="6"
       data-initial-results="3"></div>
 </div></section>
 
+<section id="useUpdatedTemplates" style="display:none" class="dac-section dac-gray dac-small" id="latest"><div class="wrap">
+  <h2 class="norule">Latest</h2>
+
+  <div class="dac-filter dac-filter-section" data-filter="#latest-resources">
+    <div data-tabs>
+      <span class="dac-filter-title">Showing:</span>
+      <ol class="dac-tab-bar">
+        <li class="dac-tab-item" data-tab-item="goal">
+          <p class="dac-tab-title">Goals <i class="dac-tab-arrow dac-sprite dac-expand-more-black"></i></p>
+          <span data-filter-count="goal" class="dac-filter-count dac-disabled">0</span>
+        </li>
+        <li class="dac-tab-item" data-tab-item="type">
+          <p class="dac-tab-title">Types <i class="dac-filter-item-arrow dac-sprite dac-expand-more-black"></i></p>
+          <span data-filter-count="type" class="dac-filter-count dac-disabled">0</span>
+        </li>
+      </ol>
+
+      <ol class="dac-tab-views" data-tab-views>
+        <li class="dac-tab-view" data-tab-view="goal">
+          <div class="dac-filter-item" data-filter-value="category:googleplay" data-filter-name="Get Started"></div>
+          <div class="dac-filter-item" data-filter-value="category:users" data-filter-name="Get Users"></div>
+          <div class="dac-filter-item" data-filter-value="category:engage" data-filter-name="Engage"></div>
+          <div class="dac-filter-item" data-filter-value="category:monetize" data-filter-name="Earn"></div>
+          <div class="dac-filter-item" data-filter-value="category:analyze" data-filter-name="Analyze"></div>
+          <div class="dac-filter-item" data-filter-value="category:stories" data-filter-name="Stories"></div>
+
+        </li>
+        <li class="dac-tab-view" data-tab-view="type">
+          <div class="dac-filter-item" data-filter-value="type:distribute" data-filter-name="Articles"></div>
+          <div class="dac-filter-item" data-filter-value="type:youtube" data-filter-name="Videos"></div>
+          <div class="dac-filter-item" data-filter-value="type:blog" data-filter-name="Blog posts"></div>
+        </li>
+      </ol>
+    </div>
+
+    <ul class="dac-filter-chips" data-filter-chips></ul>
+  </div>
+
+  <div class="resource-flow-layout col-16" id="latest-resources"
+      data-query="type:distribute, type:youtube+tag:googleplay, type:blog+tag:googleplay+tag:featured"
+      data-sortOrder="-timestamp"
+      data-cardSizes="6x6"
+      data-items-per-page="6"
+      data-initial-results="6"></div>
+</div></section>
+
+
 <section class="dac-section dac-invert dac-darken-bg" style="background-image: url(/images/distribute/google-play-bg.jpg)"><div class="wrap">
   <div class="cols"><div class="col-10of12 col-push-1of12">
     <h1 class="dac-section-title">Reach the world with Google Play</h1>
diff --git a/docs/html/distribute/stories/games.jd b/docs/html/distribute/stories/games.jd
index 2351eed..22ab1dc 100644
--- a/docs/html/distribute/stories/games.jd
+++ b/docs/html/distribute/stories/games.jd
@@ -1,5 +1,6 @@
 page.title=Developer Stories: Google Play Game Services
-meta.tags="google play, story, stories, games, global"
+meta.tags="google play, games, global, developer story"
+page.timestamp=1381449601
 page.image=/images/distribute/glu-ew-gpgames.jpg
 page.metaDescription=How game studios are using Google Play game services to deliver new gaming experiences for their users.
 
diff --git a/docs/html/distribute/stories/index.jd b/docs/html/distribute/stories/index.jd
index ca7647d..eb94e31 100644
--- a/docs/html/distribute/stories/index.jd
+++ b/docs/html/distribute/stories/index.jd
@@ -1,13 +1,41 @@
 page.title=Developer Stories
 section.landing=true
+nonavpage=true
+excludeFromSuggestions=true
 page.metaDescription=Android developers, their apps, and their successes with Android and Google Play.
 
 @jd:body
 
+<script>
+  $(document).ready(function() {
+    if (useUpdatedTemplates) {
+      $("#useUpdatedTemplates").css("display","block");
+    } else {
+      $("#useOldTemplates").css("display","block");
+    }
+  })
+</script>
+
 <p>Android developers, their apps, and their successes with Android and Google Play.</p>
 
-<div class="resource-widget resource-flow-layout col-13"
-    data-query="type:youtube+tag:developerstory"
-    data-sortOrder="-timestamp"
-    data-cardSizes="18x12"
-    data-maxResults="32"></div>
+<section class="dac-section dac-small" id="latest-apps"><div class="wrap">
+  <h2 class="norule">Latest from apps</h2>
+
+  <div class="resource-widget resource-flow-layout col-16"
+      data-query="type:distribute+tag:developerstory+tag:apps, type:youtube+tag:developerstory+tag:apps"
+      data-sortOrder="-timestamp"
+      data-cardSizes="6x6"
+      data-items-per-page="15"
+      data-initial-results="6"></div>
+</div></section>
+
+<section class="dac-section dac-small" id="latest-games"><div class="wrap">
+  <h2 class="norule">Latest from games</h2>
+
+  <div class="resource-widget resource-flow-layout col-16"
+      data-query="type:distribute+tag:developerstory+tag:games,type:youtube+tag:developerstory+tag:games"
+      data-sortOrder="-timestamp"
+      data-cardSizes="6x6"
+      data-items-per-page="15"
+      data-initial-results="6"></div>
+</div></section>
diff --git a/docs/html/distribute/stories/localization.jd b/docs/html/distribute/stories/localization.jd
index d6e6ccf..a6a17eb 100644
--- a/docs/html/distribute/stories/localization.jd
+++ b/docs/html/distribute/stories/localization.jd
@@ -1,6 +1,7 @@
 page.title=Developer Stories: Localization in Google Play
-meta.tags="google play, developer story, localization, global"
+meta.tags="google play, developer story, localization, global, games"
 page.tags="stories", "video", "case study"
+page.timestamp=1381449600
 page.image=/images/distribute/zombie-ragdoll-n5-land.jpg
 page.metaDescription=Hear from Android developers who have successfully used the Google Play App Translation Service.
 
diff --git a/docs/html/distribute/stories/tablets.jd b/docs/html/distribute/stories/tablets.jd
index 771fa52..085cd8f 100644
--- a/docs/html/distribute/stories/tablets.jd
+++ b/docs/html/distribute/stories/tablets.jd
@@ -1,7 +1,8 @@
 page.title=Developer Stories: The Opportunity of Android Tablets
-meta.tags="google play, developer story, journal, tablets, pure"
-pdage.metaDescription=Developers are investing in a full tablet experience for their apps and seeing those investments pay off big.
-page.image=/images/distribute/rememberthemilk.png
+meta.tags="google play, developer story, journal, tablets, apps"
+page.metaDescription=Developers are investing in a full tablet experience for their apps and seeing those investments pay off big.
+page.image=images/distribute/rememberthemilk.png
+page.timestamp=1381449600
 
 @jd:body
 
diff --git a/docs/html/distribute/tools/promote/brand.jd b/docs/html/distribute/tools/promote/brand.jd
index cf83a5e..409dfdd 100644
--- a/docs/html/distribute/tools/promote/brand.jd
+++ b/docs/html/distribute/tools/promote/brand.jd
@@ -14,6 +14,12 @@
 href="https://support.google.com/googleplay/contact/brand_developer">Android and Google Play Brand Permissions Inquiry form</a> to submit your
 marketing for review.</p>
 
+<p>
+  If you need Google Play badges or guidelines, please see the
+  <a href="https://play.google.com/intl/en_us/badges/">Google Play Badge</a> page.
+</p>
+
+
 <h2 id="brand-android">Android</h2>
 
  <p>The following are guidelines for the Android brand
@@ -101,103 +107,10 @@
 
 <p>The custom typeface may not be used.</p>
 
-<p>The following are guidelines for the Google Play brand.</p>
-
-<h4>Google Play&#8482; Badges</h4>
-
-  <div style="float:right;clear:right;width:172px;margin-left:30px">
-    <img src="{@docRoot}images/brand/en_app_rgb_wo_60.png" alt="">
-    <p style="text-align:center">
-       <a href="{@docRoot}images/brand/en_app_rgb_wo_45.png">129x45</a> |
-       <a href="{@docRoot}images/brand/en_app_rgb_wo_60.png">172x60</a></p>
-  </div>
-
-  <div style="float:right;clear:right;width:172px;margin-left:30px">
-    <img src="{@docRoot}images/brand/en_generic_rgb_wo_60.png" alt="">
-    <p style="text-align:center">
-       <a href="{@docRoot}images/brand/en_generic_rgb_wo_45.png">129x45</a> |
-       <a href="{@docRoot}images/brand/en_generic_rgb_wo_60.png">172x60</a></p>
-  </div>
-
-  <p>Use the "Get it on Google Play" and "Android App on Google Play" badges on your website and
-  promotional materials to point to your products on Google Play. These badges are both available
-  in over 40 languages. Additional Google Play badge formats and
-    badges for music, books, magazines, movies, and TV shows are also available.
-    Use the  <a
-    href="https://support.google.com/googleplay/contact/brand_developer">Android
-    and Google Play Brand Permissions Inquiry form</a> to request
-    those badges.</p>
-
-  <p>Google Play badge guidelines:</p>
-  <ul>
-    <li>Don't modify the color, proportions, spacing, or any other aspect of the badge.</li>
-    <li>When used alongside logos for other application marketplaces, the Google Play badge
-    should be of equal or greater size.</li>
-    <li>When used online, the badge should link to either:</li>
-      <ul>
-        <li>A list of products published by you, for example:<br />
-        <span style="margin-left:1em;">http://play.google.com/store/search?q=<em>publisherName</em></span>
-        </li>
-        <li>A specific app product details page within Google Play, for example:<br />
-        <span style="margin-left:1em;">http://play.google.com/store/apps/details?id=<em>packageName</em></span>
-        </li>
-      </ul>
-    <li>You do not need to include a legal attribution if you are only using a Google Play badge.
-    However, keep in mind that:</li>
-     <ul>
-     <li>If you make any mention of Google Play or Android outside of the badge a legal attribution
-     must be included. </li>
-     <li>If you are including another app store’s legal attribution then include this legal
-     attribution:</li>
-      <ul>
-      <li>Google Play is a trademark of Google Inc.</li>
-      </ul>
-    </li>
-    <li>Use of the Google Play badge does not need to be reviewed or approved by the Google Play
-    brand team unless the marketing campaign will have over 1 million impressions.</li>
-  </ul>
-
-  <p>To quickly create a badge that links to your apps on Google Play,
-  use the <a
-  href="{@docRoot}distribute/tools/promote/badges.html">Google Play badge generator</a>
-  (badges available in over 40 languages).</p>
-
-  <p>For details on all the ways that you can link to your product details page in Google Play,
-    see <a href="{@docRoot}distribute/tools/promote/linking.html">Linking to your products</a>.</p>
-
-<h2 id="Marketing_Review">Google Play in Text</h2>
-
-<p>Any use of Google Play in text must be reviewed and approved by the Google Play brand team.
-Submit your marketing via the <a href="https://support.google.com/googleplay/contact/brand_developer">
-Android and Google Play Partner Brand Inquiry Form.</a></p>
-
-<p>Always include a ™ symbol on the first or most prominent instance of Google Play™ in text.</p>
-
-<p>When mentioning that a product is available on Google Play always say “on Google Play”</p>
-
-<ul>
-<li><span style="color:red">Incorrect</span>: Our app is now available from Google Play.</li>
-<li><span style="color:green">Correct</span>: Our app is now available on Google Play.</li>
-</ul>
-<br>
-<p>Only refer to Google Play as the Google Play™ store app in instructional text meant to inform a
-customer about how to find or download your product on Google Play.</p>
-
-<ul>
-<li><span style="color:red">Incorrect</span>:  Download our games using the Google Play™ store app.</li>
-<li><span style="color:green">Correct</span>: This is how you download our app using the Google
-Play™ store app.</li>
-</ul>
-<br>
-
-<p>Any use of the Google Play name in your marketing or communications needs to be accompanied by
-this legal attribution:</p>
-
-<p><em>Google Play is a trademark of Google Inc.</em></p>
 
 <h2 id="Marketing_Review">Marketing Reviews and Brand Inquiries</h2>
 
 <p>Use the <a
 href="https://support.google.com/googleplay/contact/brand_developer">Android
 and Google Play Brand Permissions Inquiry form</a> to submit any marketing
-reviews or brand inquires. Typical response time is at least one week.</p>
\ No newline at end of file
+reviews or brand inquires. Typical response time is at least one week.</p>
diff --git a/docs/html/distribute/users/banners.jd b/docs/html/distribute/users/banners.jd
index 8a7ccc0..d889ac7 100644
--- a/docs/html/distribute/users/banners.jd
+++ b/docs/html/distribute/users/banners.jd
@@ -1,6 +1,6 @@
 page.title=Add An App Install Banner On Your Mobile Website
 page.metaDescription=Add a native app install banner to your mobile website and allow visitors to install your app straight from your site.
-page.image=images/cards/distribute/users/banners.png
+page.image=images/cards/card-install-banners_16x9_2x.png
 page.tags="banner, chrome, web"
 Xnonavpage=true
 
diff --git a/docs/html/google/backup/signup.jd b/docs/html/google/backup/signup.jd
index f9ad600..598003d 100644
--- a/docs/html/google/backup/signup.jd
+++ b/docs/html/google/backup/signup.jd
@@ -208,7 +208,7 @@
 <input id="pname" type="text" name="pname" size="47" value="" onkeyup="onFormInput()"
 onfocus="boxFocusChanged(this,true)" onblur="boxFocusChanged(this,false)"/>
 </p>
-<p><a href="" class="button disabled" id="registerButton" 
+<p><a href="" class="dac-button dac-raised dac-primary disabled ndk" id="registerButton" 
 onclick="onRegister(); return false;" >Register with Android Backup Service</a></p>
 </div>
 
diff --git a/docs/html/google/index.jd b/docs/html/google/index.jd
index a2a6c50..b3ceee3 100644
--- a/docs/html/google/index.jd
+++ b/docs/html/google/index.jd
@@ -39,12 +39,13 @@
   </a>
 </div>
 
-<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">
+<section class="dac-section dac-gray dac-small" id="latest"><div class="wrap">
   <h2 class="norule">Latest</h2>
   <div class="resource-widget resource-flow-layout col-16"
        data-query="type:blog+tag:googleservices+tag:featured"
        data-cardSizes="6x6"
-       data-maxResults="12"
+       data-maxResults="15"
+       data-items-per-page="6"
        data-initial-results="3"></div>
   </div>
 </section>
@@ -68,7 +69,7 @@
   </div>
 </section>
 
-<section class="dac-section dac-gray dac-small dac-invert" id="videos"><div class="wrap">
+<section class="dac-section dac-gray dac-small" id="videos"><div class="wrap">
   <h2 class="norule">Videos</h2>
   <div class="resource-widget resource-flow-layout col-16"
        data-query="collection:google/landing/videos"
diff --git a/docs/html/guide/topics/resources/string-resource.jd b/docs/html/guide/topics/resources/string-resource.jd
index 743e692..6e874d0 100644
--- a/docs/html/guide/topics/resources/string-resource.jd
+++ b/docs/html/guide/topics/resources/string-resource.jd
@@ -1,6 +1,7 @@
 page.title=String Resources
 parent.title=Resource Types
 parent.link=available-resources.html
+page.metaDescription=Explains how to use string resources in your UI.
 @jd:body
 
 <p>A string resource provides text strings for your application
diff --git a/docs/html/images/brand/Google_Play_Store_48.png b/docs/html/images/brand/Google_Play_Store_48.png
deleted file mode 100644
index 2f0cfe0..0000000
--- a/docs/html/images/brand/Google_Play_Store_48.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/Google_Play_Store_600.png b/docs/html/images/brand/Google_Play_Store_600.png
deleted file mode 100644
index f748652..0000000
--- a/docs/html/images/brand/Google_Play_Store_600.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/Google_Play_Store_96.png b/docs/html/images/brand/Google_Play_Store_96.png
deleted file mode 100644
index 6e2c835..0000000
--- a/docs/html/images/brand/Google_Play_Store_96.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/af_generic_rgb_wo_45.png b/docs/html/images/brand/af_generic_rgb_wo_45.png
deleted file mode 100644
index bf774ab..0000000
--- a/docs/html/images/brand/af_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/af_generic_rgb_wo_60.png b/docs/html/images/brand/af_generic_rgb_wo_60.png
deleted file mode 100644
index 0487c7f..0000000
--- a/docs/html/images/brand/af_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ar_generic_rgb_wo_45.png b/docs/html/images/brand/ar_generic_rgb_wo_45.png
deleted file mode 100644
index c403608..0000000
--- a/docs/html/images/brand/ar_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ar_generic_rgb_wo_60.png b/docs/html/images/brand/ar_generic_rgb_wo_60.png
deleted file mode 100644
index 95e31eb..0000000
--- a/docs/html/images/brand/ar_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/be_generic_rgb_wo_45.png b/docs/html/images/brand/be_generic_rgb_wo_45.png
deleted file mode 100644
index bec6c7a..0000000
--- a/docs/html/images/brand/be_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/be_generic_rgb_wo_60.png b/docs/html/images/brand/be_generic_rgb_wo_60.png
deleted file mode 100644
index 53ad2a11..0000000
--- a/docs/html/images/brand/be_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/bg_generic_rgb_wo_45.png b/docs/html/images/brand/bg_generic_rgb_wo_45.png
deleted file mode 100644
index 9a27471..0000000
--- a/docs/html/images/brand/bg_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/bg_generic_rgb_wo_60.png b/docs/html/images/brand/bg_generic_rgb_wo_60.png
deleted file mode 100644
index 5143a66..0000000
--- a/docs/html/images/brand/bg_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ca_generic_rgb_wo_45.png b/docs/html/images/brand/ca_generic_rgb_wo_45.png
deleted file mode 100644
index 698a4cd..0000000
--- a/docs/html/images/brand/ca_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ca_generic_rgb_wo_60.png b/docs/html/images/brand/ca_generic_rgb_wo_60.png
deleted file mode 100644
index e943de1..0000000
--- a/docs/html/images/brand/ca_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/cs_generic_rgb_wo_45.png b/docs/html/images/brand/cs_generic_rgb_wo_45.png
deleted file mode 100644
index b97b805..0000000
--- a/docs/html/images/brand/cs_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/cs_generic_rgb_wo_60.png b/docs/html/images/brand/cs_generic_rgb_wo_60.png
deleted file mode 100644
index 9656c2e..0000000
--- a/docs/html/images/brand/cs_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/da_generic_rgb_wo_45.png b/docs/html/images/brand/da_generic_rgb_wo_45.png
deleted file mode 100644
index 541ba29..0000000
--- a/docs/html/images/brand/da_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/da_generic_rgb_wo_60.png b/docs/html/images/brand/da_generic_rgb_wo_60.png
deleted file mode 100644
index d974154..0000000
--- a/docs/html/images/brand/da_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/de_app_rgb_wo_45.png b/docs/html/images/brand/de_app_rgb_wo_45.png
deleted file mode 100644
index db48df2..0000000
--- a/docs/html/images/brand/de_app_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/de_app_rgb_wo_60.png b/docs/html/images/brand/de_app_rgb_wo_60.png
deleted file mode 100644
index 9e0f757..0000000
--- a/docs/html/images/brand/de_app_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/de_generic_rgb_wo_45.png b/docs/html/images/brand/de_generic_rgb_wo_45.png
deleted file mode 100644
index 1396f79..0000000
--- a/docs/html/images/brand/de_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/de_generic_rgb_wo_60.png b/docs/html/images/brand/de_generic_rgb_wo_60.png
deleted file mode 100644
index f2df4a4..0000000
--- a/docs/html/images/brand/de_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/el_generic_rgb_wo_45.png b/docs/html/images/brand/el_generic_rgb_wo_45.png
deleted file mode 100644
index adaea5f..0000000
--- a/docs/html/images/brand/el_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/el_generic_rgb_wo_60.png b/docs/html/images/brand/el_generic_rgb_wo_60.png
deleted file mode 100644
index 37ae3bc..0000000
--- a/docs/html/images/brand/el_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/en_app_rgb_wo_45.png b/docs/html/images/brand/en_app_rgb_wo_45.png
deleted file mode 100644
index 9891cbb..0000000
--- a/docs/html/images/brand/en_app_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/en_app_rgb_wo_60.png b/docs/html/images/brand/en_app_rgb_wo_60.png
deleted file mode 100644
index 649e782..0000000
--- a/docs/html/images/brand/en_app_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/en_generic_rgb_wo_45.png b/docs/html/images/brand/en_generic_rgb_wo_45.png
deleted file mode 100644
index 73dd393..0000000
--- a/docs/html/images/brand/en_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/en_generic_rgb_wo_60.png b/docs/html/images/brand/en_generic_rgb_wo_60.png
deleted file mode 100644
index 9a50aff..0000000
--- a/docs/html/images/brand/en_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/es-419_app_rgb_wo_45.png b/docs/html/images/brand/es-419_app_rgb_wo_45.png
deleted file mode 100644
index 3fb9a3f..0000000
--- a/docs/html/images/brand/es-419_app_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/es-419_app_rgb_wo_60.png b/docs/html/images/brand/es-419_app_rgb_wo_60.png
deleted file mode 100644
index 1dfb8200..0000000
--- a/docs/html/images/brand/es-419_app_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/es-419_generic_rgb_wo_45.png b/docs/html/images/brand/es-419_generic_rgb_wo_45.png
deleted file mode 100644
index b89274d..0000000
--- a/docs/html/images/brand/es-419_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/es-419_generic_rgb_wo_60.png b/docs/html/images/brand/es-419_generic_rgb_wo_60.png
deleted file mode 100644
index 23d7705..0000000
--- a/docs/html/images/brand/es-419_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/es_app_rgb_wo_45.png b/docs/html/images/brand/es_app_rgb_wo_45.png
deleted file mode 100644
index ad5e61a..0000000
--- a/docs/html/images/brand/es_app_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/es_app_rgb_wo_60.png b/docs/html/images/brand/es_app_rgb_wo_60.png
deleted file mode 100644
index 6796ad3..0000000
--- a/docs/html/images/brand/es_app_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/es_generic_rgb_wo_45.png b/docs/html/images/brand/es_generic_rgb_wo_45.png
deleted file mode 100644
index b89274d..0000000
--- a/docs/html/images/brand/es_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/es_generic_rgb_wo_60.png b/docs/html/images/brand/es_generic_rgb_wo_60.png
deleted file mode 100644
index 23d7705..0000000
--- a/docs/html/images/brand/es_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/et_generic_rgb_wo_45.png b/docs/html/images/brand/et_generic_rgb_wo_45.png
deleted file mode 100644
index 0e267381..0000000
--- a/docs/html/images/brand/et_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/et_generic_rgb_wo_60.png b/docs/html/images/brand/et_generic_rgb_wo_60.png
deleted file mode 100644
index a99dee1..0000000
--- a/docs/html/images/brand/et_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/fa_generic_rgb_wo_45.png b/docs/html/images/brand/fa_generic_rgb_wo_45.png
deleted file mode 100644
index 25827f6..0000000
--- a/docs/html/images/brand/fa_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/fa_generic_rgb_wo_60.png b/docs/html/images/brand/fa_generic_rgb_wo_60.png
deleted file mode 100644
index 5118909..0000000
--- a/docs/html/images/brand/fa_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/fi_generic_rgb_wo_45.png b/docs/html/images/brand/fi_generic_rgb_wo_45.png
deleted file mode 100644
index 93dc4fc..0000000
--- a/docs/html/images/brand/fi_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/fi_generic_rgb_wo_60.png b/docs/html/images/brand/fi_generic_rgb_wo_60.png
deleted file mode 100644
index 95eff07..0000000
--- a/docs/html/images/brand/fi_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/fil_generic_rgb_wo_45.png b/docs/html/images/brand/fil_generic_rgb_wo_45.png
deleted file mode 100644
index 7e74e62..0000000
--- a/docs/html/images/brand/fil_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/fil_generic_rgb_wo_60.png b/docs/html/images/brand/fil_generic_rgb_wo_60.png
deleted file mode 100644
index 8f02743..0000000
--- a/docs/html/images/brand/fil_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/fr_app_rgb_wo_45.png b/docs/html/images/brand/fr_app_rgb_wo_45.png
deleted file mode 100644
index 14219e3..0000000
--- a/docs/html/images/brand/fr_app_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/fr_app_rgb_wo_60.png b/docs/html/images/brand/fr_app_rgb_wo_60.png
deleted file mode 100644
index af58843..0000000
--- a/docs/html/images/brand/fr_app_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/fr_generic_rgb_wo_45.png b/docs/html/images/brand/fr_generic_rgb_wo_45.png
deleted file mode 100644
index 3e1768f..0000000
--- a/docs/html/images/brand/fr_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/fr_generic_rgb_wo_60.png b/docs/html/images/brand/fr_generic_rgb_wo_60.png
deleted file mode 100644
index 5c307f5..0000000
--- a/docs/html/images/brand/fr_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/hr_generic_rgb_wo_45.png b/docs/html/images/brand/hr_generic_rgb_wo_45.png
deleted file mode 100644
index b8acaac..0000000
--- a/docs/html/images/brand/hr_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/hr_generic_rgb_wo_60.png b/docs/html/images/brand/hr_generic_rgb_wo_60.png
deleted file mode 100644
index 4fe6c7b..0000000
--- a/docs/html/images/brand/hr_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/hu_generic_rgb_wo_45.png b/docs/html/images/brand/hu_generic_rgb_wo_45.png
deleted file mode 100644
index 3b2184d..0000000
--- a/docs/html/images/brand/hu_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/hu_generic_rgb_wo_60.png b/docs/html/images/brand/hu_generic_rgb_wo_60.png
deleted file mode 100644
index d6572be..0000000
--- a/docs/html/images/brand/hu_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/id-in_generic_rgb_wo_45.png b/docs/html/images/brand/id-in_generic_rgb_wo_45.png
deleted file mode 100644
index 17ce069..0000000
--- a/docs/html/images/brand/id-in_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/id-in_generic_rgb_wo_60.png b/docs/html/images/brand/id-in_generic_rgb_wo_60.png
deleted file mode 100644
index ad067ce..0000000
--- a/docs/html/images/brand/id-in_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/it_app_rgb_wo_45.png b/docs/html/images/brand/it_app_rgb_wo_45.png
deleted file mode 100644
index 16a137e..0000000
--- a/docs/html/images/brand/it_app_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/it_app_rgb_wo_60.png b/docs/html/images/brand/it_app_rgb_wo_60.png
deleted file mode 100644
index 27123dc..0000000
--- a/docs/html/images/brand/it_app_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/it_generic_rgb_wo_45.png b/docs/html/images/brand/it_generic_rgb_wo_45.png
deleted file mode 100644
index ee5f85e..0000000
--- a/docs/html/images/brand/it_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/it_generic_rgb_wo_60.png b/docs/html/images/brand/it_generic_rgb_wo_60.png
deleted file mode 100644
index 03ea5ba..0000000
--- a/docs/html/images/brand/it_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/iw-he_generic_rgb_wo_45.png b/docs/html/images/brand/iw-he_generic_rgb_wo_45.png
deleted file mode 100644
index 1d03c77..0000000
--- a/docs/html/images/brand/iw-he_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/iw-he_generic_rgb_wo_60.png b/docs/html/images/brand/iw-he_generic_rgb_wo_60.png
deleted file mode 100644
index decfdae..0000000
--- a/docs/html/images/brand/iw-he_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ja_app_rgb_wo_45.png b/docs/html/images/brand/ja_app_rgb_wo_45.png
deleted file mode 100644
index 6af7582..0000000
--- a/docs/html/images/brand/ja_app_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ja_app_rgb_wo_60.png b/docs/html/images/brand/ja_app_rgb_wo_60.png
deleted file mode 100644
index e197e12..0000000
--- a/docs/html/images/brand/ja_app_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ja_generic_rgb_wo_45.png b/docs/html/images/brand/ja_generic_rgb_wo_45.png
deleted file mode 100644
index 5f5281a..0000000
--- a/docs/html/images/brand/ja_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ja_generic_rgb_wo_60.png b/docs/html/images/brand/ja_generic_rgb_wo_60.png
deleted file mode 100644
index fcb4c9c..0000000
--- a/docs/html/images/brand/ja_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ko_app_rgb_wo_45.png b/docs/html/images/brand/ko_app_rgb_wo_45.png
deleted file mode 100644
index f0b427e..0000000
--- a/docs/html/images/brand/ko_app_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ko_app_rgb_wo_60.png b/docs/html/images/brand/ko_app_rgb_wo_60.png
deleted file mode 100644
index 6ccb673..0000000
--- a/docs/html/images/brand/ko_app_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ko_generic_rgb_wo_45.png b/docs/html/images/brand/ko_generic_rgb_wo_45.png
deleted file mode 100644
index 61ae04a..0000000
--- a/docs/html/images/brand/ko_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ko_generic_rgb_wo_60.png b/docs/html/images/brand/ko_generic_rgb_wo_60.png
deleted file mode 100644
index 9c14e36..0000000
--- a/docs/html/images/brand/ko_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/lt_generic_rgb_wo_45.png b/docs/html/images/brand/lt_generic_rgb_wo_45.png
deleted file mode 100644
index 96564d5..0000000
--- a/docs/html/images/brand/lt_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/lt_generic_rgb_wo_60.png b/docs/html/images/brand/lt_generic_rgb_wo_60.png
deleted file mode 100644
index 2c6c1bf..0000000
--- a/docs/html/images/brand/lt_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/lv_generic_rgb_wo_45.png b/docs/html/images/brand/lv_generic_rgb_wo_45.png
deleted file mode 100644
index 8182ca5..0000000
--- a/docs/html/images/brand/lv_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/lv_generic_rgb_wo_60.png b/docs/html/images/brand/lv_generic_rgb_wo_60.png
deleted file mode 100644
index 5c0b3d2..0000000
--- a/docs/html/images/brand/lv_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ms_generic_rgb_wo_45.png b/docs/html/images/brand/ms_generic_rgb_wo_45.png
deleted file mode 100644
index d6ccc6b..0000000
--- a/docs/html/images/brand/ms_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ms_generic_rgb_wo_60.png b/docs/html/images/brand/ms_generic_rgb_wo_60.png
deleted file mode 100644
index 6e1c34d..0000000
--- a/docs/html/images/brand/ms_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/nl_app_rgb_wo_45.png b/docs/html/images/brand/nl_app_rgb_wo_45.png
deleted file mode 100644
index f06ed04..0000000
--- a/docs/html/images/brand/nl_app_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/nl_app_rgb_wo_60.png b/docs/html/images/brand/nl_app_rgb_wo_60.png
deleted file mode 100644
index f2c797d..0000000
--- a/docs/html/images/brand/nl_app_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/nl_generic_rgb_wo_45.png b/docs/html/images/brand/nl_generic_rgb_wo_45.png
deleted file mode 100644
index 6b5826d..0000000
--- a/docs/html/images/brand/nl_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/nl_generic_rgb_wo_60.png b/docs/html/images/brand/nl_generic_rgb_wo_60.png
deleted file mode 100644
index cb11afda..0000000
--- a/docs/html/images/brand/nl_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/no_generic_rgb_wo_45.png b/docs/html/images/brand/no_generic_rgb_wo_45.png
deleted file mode 100644
index fb390d8..0000000
--- a/docs/html/images/brand/no_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/no_generic_rgb_wo_60.png b/docs/html/images/brand/no_generic_rgb_wo_60.png
deleted file mode 100644
index e83dce7..0000000
--- a/docs/html/images/brand/no_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/pl_generic_rgb_wo_45.png b/docs/html/images/brand/pl_generic_rgb_wo_45.png
deleted file mode 100644
index 78caded..0000000
--- a/docs/html/images/brand/pl_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/pl_generic_rgb_wo_60.png b/docs/html/images/brand/pl_generic_rgb_wo_60.png
deleted file mode 100644
index 2d956fb..0000000
--- a/docs/html/images/brand/pl_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/pt-br_app_rgb_wo_45.png b/docs/html/images/brand/pt-br_app_rgb_wo_45.png
deleted file mode 100644
index 065998b..0000000
--- a/docs/html/images/brand/pt-br_app_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/pt-br_app_rgb_wo_60.png b/docs/html/images/brand/pt-br_app_rgb_wo_60.png
deleted file mode 100644
index 1ce0a6c..0000000
--- a/docs/html/images/brand/pt-br_app_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/pt-br_generic_rgb_wo_45.png b/docs/html/images/brand/pt-br_generic_rgb_wo_45.png
deleted file mode 100644
index a661d44..0000000
--- a/docs/html/images/brand/pt-br_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/pt-br_generic_rgb_wo_60.png b/docs/html/images/brand/pt-br_generic_rgb_wo_60.png
deleted file mode 100644
index 402af71..0000000
--- a/docs/html/images/brand/pt-br_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/pt-pt_app_rgb_wo_45.png b/docs/html/images/brand/pt-pt_app_rgb_wo_45.png
deleted file mode 100644
index 0b50959..0000000
--- a/docs/html/images/brand/pt-pt_app_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/pt-pt_app_rgb_wo_60.png b/docs/html/images/brand/pt-pt_app_rgb_wo_60.png
deleted file mode 100644
index 65dd887..0000000
--- a/docs/html/images/brand/pt-pt_app_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/pt-pt_generic_rgb_wo_45.png b/docs/html/images/brand/pt-pt_generic_rgb_wo_45.png
deleted file mode 100644
index a616cf1..0000000
--- a/docs/html/images/brand/pt-pt_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/pt-pt_generic_rgb_wo_60.png b/docs/html/images/brand/pt-pt_generic_rgb_wo_60.png
deleted file mode 100644
index 36a7b83..0000000
--- a/docs/html/images/brand/pt-pt_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ro_generic_rgb_wo_45.png b/docs/html/images/brand/ro_generic_rgb_wo_45.png
deleted file mode 100644
index c18a548..0000000
--- a/docs/html/images/brand/ro_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ro_generic_rgb_wo_60.png b/docs/html/images/brand/ro_generic_rgb_wo_60.png
deleted file mode 100644
index b8f3433..0000000
--- a/docs/html/images/brand/ro_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ru_generic_rgb_wo_45.png b/docs/html/images/brand/ru_generic_rgb_wo_45.png
deleted file mode 100644
index c049ddb..0000000
--- a/docs/html/images/brand/ru_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/ru_generic_rgb_wo_60.png b/docs/html/images/brand/ru_generic_rgb_wo_60.png
deleted file mode 100644
index e00c276..0000000
--- a/docs/html/images/brand/ru_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/sk_generic_rgb_wo_45.png b/docs/html/images/brand/sk_generic_rgb_wo_45.png
deleted file mode 100644
index 27ce06a..0000000
--- a/docs/html/images/brand/sk_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/sk_generic_rgb_wo_60.png b/docs/html/images/brand/sk_generic_rgb_wo_60.png
deleted file mode 100644
index 8591f2c..0000000
--- a/docs/html/images/brand/sk_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/sl_generic_rgb_wo_45.png b/docs/html/images/brand/sl_generic_rgb_wo_45.png
deleted file mode 100644
index 115a99d..0000000
--- a/docs/html/images/brand/sl_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/sl_generic_rgb_wo_60.png b/docs/html/images/brand/sl_generic_rgb_wo_60.png
deleted file mode 100644
index 37c2e52..0000000
--- a/docs/html/images/brand/sl_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/sr_generic_rgb_wo_45.png b/docs/html/images/brand/sr_generic_rgb_wo_45.png
deleted file mode 100644
index 86dba47..0000000
--- a/docs/html/images/brand/sr_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/sr_generic_rgb_wo_60.png b/docs/html/images/brand/sr_generic_rgb_wo_60.png
deleted file mode 100644
index 67806da..0000000
--- a/docs/html/images/brand/sr_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/sv_generic_rgb_wo_45.png b/docs/html/images/brand/sv_generic_rgb_wo_45.png
deleted file mode 100644
index fb390d8..0000000
--- a/docs/html/images/brand/sv_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/sv_generic_rgb_wo_60.png b/docs/html/images/brand/sv_generic_rgb_wo_60.png
deleted file mode 100644
index e83dce7..0000000
--- a/docs/html/images/brand/sv_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/sw_generic_rgb_wo_45.png b/docs/html/images/brand/sw_generic_rgb_wo_45.png
deleted file mode 100644
index c7deecc..0000000
--- a/docs/html/images/brand/sw_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/sw_generic_rgb_wo_60.png b/docs/html/images/brand/sw_generic_rgb_wo_60.png
deleted file mode 100644
index 9c0d057..0000000
--- a/docs/html/images/brand/sw_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/th_generic_rgb_wo_45.png b/docs/html/images/brand/th_generic_rgb_wo_45.png
deleted file mode 100644
index 803b6c5..0000000
--- a/docs/html/images/brand/th_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/th_generic_rgb_wo_60.png b/docs/html/images/brand/th_generic_rgb_wo_60.png
deleted file mode 100644
index 6e36e02..0000000
--- a/docs/html/images/brand/th_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/tr_generic_rgb_wo_45.png b/docs/html/images/brand/tr_generic_rgb_wo_45.png
deleted file mode 100644
index baa8394..0000000
--- a/docs/html/images/brand/tr_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/tr_generic_rgb_wo_60.png b/docs/html/images/brand/tr_generic_rgb_wo_60.png
deleted file mode 100644
index 63fa31f..0000000
--- a/docs/html/images/brand/tr_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/uk_generic_rgb_wo_45.png b/docs/html/images/brand/uk_generic_rgb_wo_45.png
deleted file mode 100644
index 68c111f..0000000
--- a/docs/html/images/brand/uk_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/uk_generic_rgb_wo_60.png b/docs/html/images/brand/uk_generic_rgb_wo_60.png
deleted file mode 100644
index 918d70a..0000000
--- a/docs/html/images/brand/uk_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/vi_generic_rgb_wo_45.png b/docs/html/images/brand/vi_generic_rgb_wo_45.png
deleted file mode 100644
index e39d00a..0000000
--- a/docs/html/images/brand/vi_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/vi_generic_rgb_wo_60.png b/docs/html/images/brand/vi_generic_rgb_wo_60.png
deleted file mode 100644
index ba1e9a0..0000000
--- a/docs/html/images/brand/vi_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/zh-cn_generic_rgb_wo_45.png b/docs/html/images/brand/zh-cn_generic_rgb_wo_45.png
deleted file mode 100644
index c7748de..0000000
--- a/docs/html/images/brand/zh-cn_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/zh-cn_generic_rgb_wo_60.png b/docs/html/images/brand/zh-cn_generic_rgb_wo_60.png
deleted file mode 100644
index 0a0f91a..0000000
--- a/docs/html/images/brand/zh-cn_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/zh-hk_generic_rgb_wo_45.png b/docs/html/images/brand/zh-hk_generic_rgb_wo_45.png
deleted file mode 100644
index c3d064c..0000000
--- a/docs/html/images/brand/zh-hk_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/zh-hk_generic_rgb_wo_60.png b/docs/html/images/brand/zh-hk_generic_rgb_wo_60.png
deleted file mode 100644
index 2b072de..0000000
--- a/docs/html/images/brand/zh-hk_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/zh-tw_generic_rgb_wo_45.png b/docs/html/images/brand/zh-tw_generic_rgb_wo_45.png
deleted file mode 100644
index 7bb2b09..0000000
--- a/docs/html/images/brand/zh-tw_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/zh-tw_generic_rgb_wo_60.png b/docs/html/images/brand/zh-tw_generic_rgb_wo_60.png
deleted file mode 100644
index 0797c84b..0000000
--- a/docs/html/images/brand/zh-tw_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/zu_generic_rgb_wo_45.png b/docs/html/images/brand/zu_generic_rgb_wo_45.png
deleted file mode 100644
index 1e9f7c7..0000000
--- a/docs/html/images/brand/zu_generic_rgb_wo_45.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/brand/zu_generic_rgb_wo_60.png b/docs/html/images/brand/zu_generic_rgb_wo_60.png
deleted file mode 100644
index 09f521b..0000000
--- a/docs/html/images/brand/zu_generic_rgb_wo_60.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/cards/card-install-banners_16x9_2x.png b/docs/html/images/cards/card-install-banners_16x9_2x.png
new file mode 100644
index 0000000..09ebc30
--- /dev/null
+++ b/docs/html/images/cards/card-install-banners_16x9_2x.png
Binary files differ
diff --git a/docs/html/images/cards/card-studio-modules_crop_2x.png b/docs/html/images/cards/card-studio-modules_crop_2x.png
new file mode 100644
index 0000000..98ddf1f
--- /dev/null
+++ b/docs/html/images/cards/card-studio-modules_crop_2x.png
Binary files differ
diff --git a/docs/html/images/cards/card-user-ids_2x.png b/docs/html/images/cards/card-user-ids_2x.png
index 4db4f3c..d27098d 100644
--- a/docs/html/images/cards/card-user-ids_2x.png
+++ b/docs/html/images/cards/card-user-ids_2x.png
Binary files differ
diff --git a/docs/html/images/cards/card-user-permissions_2x.png b/docs/html/images/cards/card-user-permissions_2x.png
index 6abac48..899dc3d3 100644
--- a/docs/html/images/cards/card-user-permissions_2x.png
+++ b/docs/html/images/cards/card-user-permissions_2x.png
Binary files differ
diff --git a/docs/html/images/cards/card-user_2x.png b/docs/html/images/cards/card-user_2x.png
index e4ef23d..2888356 100644
--- a/docs/html/images/cards/card-user_2x.png
+++ b/docs/html/images/cards/card-user_2x.png
Binary files differ
diff --git a/docs/html/images/editorschoice_ann.png b/docs/html/images/editorschoice_ann.png
new file mode 100644
index 0000000..c4f2c06
--- /dev/null
+++ b/docs/html/images/editorschoice_ann.png
Binary files differ
diff --git a/docs/html/images/gp-about-0.jpg b/docs/html/images/gp-about-0.jpg
new file mode 100644
index 0000000..2dd6a8c
--- /dev/null
+++ b/docs/html/images/gp-about-0.jpg
Binary files differ
diff --git a/docs/html/images/gp-about-listing.jpg b/docs/html/images/gp-about-listing.jpg
new file mode 100644
index 0000000..256c051
--- /dev/null
+++ b/docs/html/images/gp-about-listing.jpg
Binary files differ
diff --git a/docs/html/images/gp-about-picks1.jpg b/docs/html/images/gp-about-picks1.jpg
new file mode 100644
index 0000000..555bd7b
--- /dev/null
+++ b/docs/html/images/gp-about-picks1.jpg
Binary files differ
diff --git a/docs/html/images/gp-about-picks2.jpg b/docs/html/images/gp-about-picks2.jpg
new file mode 100644
index 0000000..ec25e74
--- /dev/null
+++ b/docs/html/images/gp-about-picks2.jpg
Binary files differ
diff --git a/docs/html/images/gp-about-picks3.jpg b/docs/html/images/gp-about-picks3.jpg
new file mode 100644
index 0000000..eb57da9
--- /dev/null
+++ b/docs/html/images/gp-about-picks3.jpg
Binary files differ
diff --git a/docs/html/images/gp-about-top.jpg b/docs/html/images/gp-about-top.jpg
new file mode 100644
index 0000000..01a2744
--- /dev/null
+++ b/docs/html/images/gp-about-top.jpg
Binary files differ
diff --git a/docs/html/images/gp-devconsole-home.png b/docs/html/images/gp-devconsole-home.png
new file mode 100644
index 0000000..b29dc25
--- /dev/null
+++ b/docs/html/images/gp-devconsole-home.png
Binary files differ
diff --git a/docs/html/images/gp-rating-web.png b/docs/html/images/gp-rating-web.png
new file mode 100644
index 0000000..14582af
--- /dev/null
+++ b/docs/html/images/gp-rating-web.png
Binary files differ
diff --git a/docs/html/images/tools/and-studio_feat-gradle_2x.png b/docs/html/images/tools/and-studio_feat-gradle_2x.png
new file mode 100644
index 0000000..b4821b6
--- /dev/null
+++ b/docs/html/images/tools/and-studio_feat-gradle_2x.png
Binary files differ
diff --git a/docs/html/images/tools/and-studio_shortcuts-included_2x.png b/docs/html/images/tools/and-studio_shortcuts-included_2x.png
new file mode 100644
index 0000000..8d4e30b
--- /dev/null
+++ b/docs/html/images/tools/and-studio_shortcuts-included_2x.png
Binary files differ
diff --git a/docs/html/images/tools/codeeditor-low.gif b/docs/html/images/tools/codeeditor-low.gif
new file mode 100644
index 0000000..50d840c
--- /dev/null
+++ b/docs/html/images/tools/codeeditor-low.gif
Binary files differ
diff --git a/docs/html/images/topdev_ann.png b/docs/html/images/topdev_ann.png
new file mode 100644
index 0000000..9564387e
--- /dev/null
+++ b/docs/html/images/topdev_ann.png
Binary files differ
diff --git a/docs/html/images/training/articles/user-data-overview-permissions-flow02.jpg b/docs/html/images/training/articles/user-data-overview-permissions-flow02.jpg
deleted file mode 100644
index c2275eb..0000000
--- a/docs/html/images/training/articles/user-data-overview-permissions-flow02.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/training/articles/user-data-overview-permissions-flow02.png b/docs/html/images/training/articles/user-data-overview-permissions-flow02.png
new file mode 100644
index 0000000..f572a44
--- /dev/null
+++ b/docs/html/images/training/articles/user-data-overview-permissions-flow02.png
Binary files differ
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 6c1b30a..df81589 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -5,6 +5,16 @@
 
 @jd:body
 
+<script>
+  $(document).ready(function() {
+    if (useUpdatedTemplates) {
+      $("#useUpdatedTemplates").css("display","block");
+    } else {
+      $("#useOldTemplates").css("display","block");
+    }
+  })
+</script>
+
 <!-- <div class="dac-hero-carousel" data-carousel-query="collection:index/carousel">
 </div> -->
 <section class="dac-hero-carousel">
@@ -39,11 +49,39 @@
 </a>
 </article></section>
 
-<div class="actions-bar dac-expand dac-invert">
+<div id="useUpdatedTemplates" style="display:none" class="dac-section dac-slim dac-gray dac-expand">
   <div class="wrap dac-offset-parent">
     <a class="dac-fab dac-scroll-button" data-scroll-button href="#build-apps">
       <i class="dac-sprite dac-arrow-down-gray"></i>
     </a>
+    <ul class="dac-actions">
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}sdk/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Get the SDK
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}samples/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Browse sample code
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="{@docRoot}distribute/stories/index.html">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Watch stories
+        </a>
+      </li>
+    </ul>
+  </div><!-- end .wrap -->
+</div><!-- end .dac-actions -->
+
+<div id="useOldTemplates" style="display:none" class="actions-bar dac-expand dac-invert">
+  <div class="wrap dac-offset-parent">
+    <a class="dac-fab dac-scroll-button" data-scroll-button="" href="#build-apps">
+      <i class="dac-sprite dac-arrow-down-gray"></i>
+    </a>
     <div class="actions">
       <div><a href="{@docRoot}sdk/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
@@ -53,17 +91,15 @@
         <span class="dac-sprite dac-auto-chevron-large"></span>
         Browse Samples
       </a></div>
-      <div><a href="https://www.youtube.com/user/androiddevelopers">
+      <div><a href="{@docRoot}distribute/stories/index.html">
         <span class="dac-sprite dac-auto-chevron-large"></span>
-        Watch Videos
+        Watch Stories
       </a></div>
     </div><!-- end .actions -->
   </div><!-- end .wrap -->
-</div><!-- end .actions-bar -->
+</div>
 
-
-
-<section class="dac-section dac-section-light" id="build-apps"><div class="wrap">
+<section class="dac-section dac-light" id="build-apps"><div class="wrap">
   <h1 class="dac-section-title">Build Beautiful Apps</h1>
   <div class="dac-section-subtitle">
     Resources to get you started with designing and developing for Android.
diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index 81b6d70..739b648 100644
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -16,7 +16,7 @@
   "index/secondary/carousel": {
     "title": "",
     "resources": [
-      "http://www.youtube.com/watch?v=yJisuP94lHU",
+      "https://www.youtube.com/watch?v=yJisuP94lHU",
       "http://www.youtube.com/watch?v=rcU7VEs1hiE",
       "http://www.youtube.com/watch?v=JFlX9rW7Epc",
       "http://www.youtube.com/watch?v=4CqXCkcN_d4"
@@ -41,9 +41,9 @@
   "design/landing/latest": {
     "title": "",
     "resources": [
-      "http://www.youtube.com/watch?v=p4gmvHyuZzw",
-      "http://www.youtube.com/watch?v=YaG_ljfzeUw",
-      "http://www.youtube.com/watch?v=XOcCOBe8PTc"
+      "https://www.youtube.com/watch?v=p4gmvHyuZzw",
+      "https://www.youtube.com/watch?v=YaG_ljfzeUw",
+      "https://www.youtube.com/watch?v=XOcCOBe8PTc"
     ]
   },
   "design/landing/materialdesign": {
@@ -90,9 +90,9 @@
   "develop/landing/latest": {
     "title": "",
     "resources": [
-      "http://android-developers.blogspot.com/2015/04/new-android-code-samples.html",
-      "http://android-developers.blogspot.com/2015/04/android-support-library-221.html",
-      "http://android-developers.blogspot.com/2015/03/a-new-reference-app-for-multi-device.html"
+      "https://android-developers.blogspot.com/2015/04/new-android-code-samples.html",
+      "https://android-developers.blogspot.com/2015/04/android-support-library-221.html",
+      "https://android-developers.blogspot.com/2015/03/a-new-reference-app-for-multi-device.html"
     ]
   },
   "develop/landing/devpatterns": {
@@ -106,9 +106,9 @@
   "develop/landing/performance": {
     "title": "",
     "resources": [
-      "http://www.youtube.com/watch?v=fEEulSk1kNY",
-      "http://www.youtube.com/watch?v=-3ry8PxcJJA",
-      "http://www.youtube.com/watch?v=_kKTGK-Cb_4"
+      "https://www.youtube.com/watch?v=fEEulSk1kNY",
+      "https://www.youtube.com/watch?v=-3ry8PxcJJA",
+      "https://www.youtube.com/watch?v=_kKTGK-Cb_4"
     ]
   },
   "develop/landing/buildwithgoogle": {
@@ -188,9 +188,9 @@
     "title": "",
     "resources": [
     "distribute/googleplay/guide.html",
-    "http://www.youtube.com/watch?v=JrR6o5tYMWQ",
+    "https://www.youtube.com/watch?v=JrR6o5tYMWQ",
     "https://www.youtube.com/watch?v=B6ydLpkhq04&list=PLOU2XLYxmsIKLNUPiFCWVtcO7mZRZ9MmS",
-    "http://www.youtube.com/watch?v=yJisuP94lHU",
+    "https://www.youtube.com/watch?v=yJisuP94lHU",
     ]
   },
   "distribute/landing/googleplay": {
@@ -204,12 +204,12 @@
   "distribute/landing/more": {
     "title": "",
     "resources": [
-    "distribute/users/promote-with-ads.html",
-    "distribute/monetize/ads.html",
-    "distribute/analyze/index.html",
-    "distribute/engage/deep-linking.html",
-    "distribute/engage/easy-signin.html",
-    "https://cloud.google.com/docs/"
+      "distribute/users/promote-with-ads.html",
+      "distribute/monetize/ads.html",
+      "distribute/analyze/index.html",
+      "distribute/engage/deep-linking.html",
+      "distribute/engage/easy-signin.html",
+      "https://cloud.google.com/docs/"
     ]
   },
   "distribute/edu/videos/stories": {
@@ -231,17 +231,17 @@
   "distribute/edu/videos/experience": {
     "title": "",
     "resources": [
-      "http://youtu.be/vzvpcEffvaE"
+      "https://youtu.be/vzvpcEffvaE"
     ]
   },
 /*  "launch/static": {
     "title": "",
     "resources": [
-      "http://www.youtube.com/watch?v=1RIz-cmTQB4",
-      "http://www.youtube.com/watch?v=MVBMWDzyHAI",
-      "http://android-developers.blogspot.com/2013/11/app-translation-service-now-available.html",
-      "http://android-developers.blogspot.com/2013/10/more-visibility-for-tablet-apps-in.html",
-      "http://android-developers.blogspot.com/2013/11/bring-your-apps-into-classroom-with.html",
+      "https://www.youtube.com/watch?v=1RIz-cmTQB4",
+      "https://www.youtube.com/watch?v=MVBMWDzyHAI",
+      "https://android-developers.blogspot.com/2013/11/app-translation-service-now-available.html",
+      "https://android-developers.blogspot.com/2013/10/more-visibility-for-tablet-apps-in.html",
+      "https://android-developers.blogspot.com/2013/11/bring-your-apps-into-classroom-with.html",
       "distribute/essentials/quality/tablets.html",
       "distribute/users/build-buzz.html",
       "distribute/monetize/premium.html",
@@ -258,17 +258,17 @@
     "resources": [
       "https://www.youtube.com/watch?v=xelYnWcYkuE",
       "https://www.youtube.com/playlist?list=PLCOC_kP3nqGIHEgwm9mybvA04Vn4Cg9nn",
-      "http://googledevjp.blogspot.jp/2014/12/android-wear.html",
-      "http://googledevjp.blogspot.jp/2014/12/android-studio-10.html",
-      "http://googledevjp.blogspot.jp/2014/12/google-play-65.html",
+      "https://googledevjp.blogspot.jp/2014/12/android-wear.html",
+      "https://googledevjp.blogspot.jp/2014/12/android-studio-10.html",
+      "https://googledevjp.blogspot.jp/2014/12/google-play-65.html",
       "intl/ja/distribute/googleplay/developer-console.html#alpha-beta",
       "intl/ja/distribute/googleplay/guide.html",
       "intl/ja/distribute/essentials/quality/core.html",
-      "http://support.google.com/googleplay/android-developer/answer/4430948?hl=ja",
+      "https://support.google.com/googleplay/android-developer/answer/4430948?hl=ja",
       "intl/ja/support.html",
       "intl/ja/distribute/essentials/quality/wear.html",
       "intl/ja/training/tv/start/index.html",
-      "http://googleforwork-japan.blogspot.jp/2014/12/gcp-google-cloud-platform-rpg-gcp.html",
+      "https://googleforwork-japan.blogspot.jp/2014/12/gcp-google-cloud-platform-rpg-gcp.html",
       "intl/ja/distribute/monetize/ads.html"
     ]
   },
@@ -277,9 +277,9 @@
     "resources": [
       "https://www.youtube.com/watch?v=7X9Ue0Nfdh4&index=2&list=PL_WJkTbDHdBksDBRoqfeyLchEQqBAOlNl",
       "https://www.youtube.com/watch?v=83FpwuschCQ",
-      "http://googledevkr.blogspot.com/2014/11/android50guidefordevelopers.html",
-      "http://googledevkr.blogspot.com/2014/10/material-design-on-android-checklist.html",
-      "http://googledevkr.blogspot.com/2014/10/appcompat-v21-material-design-for-pre.html",
+      "https://googledevkr.blogspot.com/2014/11/android50guidefordevelopers.html",
+      "https://googledevkr.blogspot.com/2014/10/material-design-on-android-checklist.html",
+      "https://googledevkr.blogspot.com/2014/10/appcompat-v21-material-design-for-pre.html",
       "intl/ko/distribute/googleplay/developer-console.html#alpha-beta",
       "intl/ko/distribute/googleplay/guide.html",
       "intl/ko/distribute/essentials/quality/core.html",
@@ -313,7 +313,7 @@
   },
   "distribute/googleplay/gpfw": {
     "resources": [
-      "http://www.android.com/work/",
+      "https://www.android.com/work/",
       "https://www.youtube.com/watch?v=jQWB_-o1kz4&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX",
       "training/enterprise/index.html"
     ]
@@ -371,7 +371,6 @@
       "distribute/analyze/build-better-apps.html",
       "distribute/engage/gcm.html",
       "distribute/engage/beta.html"
-
     ]
   },
   "distribute/monetize": {
@@ -401,7 +400,7 @@
       "google/play-services/index.html",
       "https://developers.google.com/analytics/solutions/mobile-implementation-guide",
       "https://developers.google.com/analytics/devguides/collection/android/",
-      "http://www.google.com/tagmanager/",
+      "https://www.google.com/tagmanager/",
       "https://github.com/googleanalytics/google-analytics-plugin-for-unity"
     ]
   },
@@ -493,14 +492,14 @@
   "distribute/tools/promote": {
     "resources": [
       "distribute/tools/promote/device-art.html",
-      "distribute/tools/promote/badges.html",
+      "https://play.google.com/intl/en_us/badges/",
       "distribute/tools/promote/linking.html"
     ]
   },
   "distribute/tools/promote/zhcn": {
     "resources": [
       "intl/zh-cn/distribute/tools/promote/device-art.html",
-      "intl/zh-cn/distribute/tools/promote/badges.html",
+      "https://play.google.com/intl/en_us/badges/",
       "intl/zh-cn/distribute/tools/promote/linking.html"
     ]
   },
@@ -523,7 +522,7 @@
   "distribute/tools/news": {
     "title": "",
     "resources": [
-      "http://android-developers.blogspot.com/",
+      "https://android-developers.blogspot.com/",
       "https://plus.google.com/+AndroidDevelopers/"
     ]
   },
@@ -606,7 +605,7 @@
     "resources": [
       "https://developers.google.com/cast/docs/ux_guidelines",
       "https://developers.google.com/cast/docs/android_sender",
-      "http://www.github.com/googlecast"
+      "https://www.github.com/googlecast"
     ]
   },
   "distribute/googleplay/cardboard": {
@@ -614,13 +613,13 @@
     "resources": [
       "https://www.google.com/get/cardboard/get-cardboard/",
       "https://developers.google.com/cardboard/android/download",
-      "http://www.google.com/design/spec-vr"
+      "https://www.google.com/design/spec-vr"
     ]
   },
   "distribute/googleplay/gpfe/highlight": {
     "title": "About Google Play for Education",
     "resources": [
-      "http://youtu.be/vzvpcEffvaE"
+      "https://youtu.be/vzvpcEffvaE"
     ]
   },
   "distribute/googleplay/gpfe/dev/about": {
@@ -641,28 +640,28 @@
       "https://developers.google.com/edu/guidelines",
       "distribute/essentials/quality/tablets.html",
       "distribute/googleplay/developer-console.html",
-      "http://play.google.com/about/developer-distribution-agreement-addendum.html",
+      "https://play.google.com/about/developer-distribution-agreement-addendum.html",
     ]
   },
   "distribute/googleplay/aboutgpfe/educators/about": {
     "title": "About Google Play for Education / Educators",
     "resources": [
-      "http://www.google.com/edu/tablets/",
-      "http://www.youtube.com/watch?v=haEmsMo0f3w"
+      "https://www.google.com/edu/tablets/",
+      "https://www.youtube.com/watch?v=haEmsMo0f3w"
     ]
   },
   "distribute/googleplay/aboutgpfe/educators": {
     "title": "About Google Play for Education / Educators",
     "resources": [
-      "http://www.google.com/edu/tablets/",
-      "http://youtu.be/vzvpcEffvaE"
+      "https://www.google.com/edu/tablets/",
+      "https://youtu.be/vzvpcEffvaE"
     ]
   },
   "distribute/googleplay/gettingstartedgpfe/educators": {
     "title": "About Google Play for Education / Educators",
     "resources": [
-      "http://www.google.com/edu/tablets/",
-      "http://youtu.be/vzvpcEffvaE"
+      "https://www.google.com/edu/tablets/",
+      "https://youtu.be/vzvpcEffvaE"
     ]
   },
   "distribute/essentials/eduessentials/developers": {
@@ -676,7 +675,7 @@
   "distribute/essentials/eduessentials/educators": {
     "title": "",
     "resources": [
-      "http://www.google.com/edu/tablets/",
+      "https://www.google.com/edu/tablets/",
       "distribute/essentials/quality/tablets.html",
     ]
   },
@@ -685,7 +684,7 @@
     "resources": [
       "design/index.html",
       "training/articles/perf-anr.html",
-      "http://android-developers.blogspot.com/2013/10/improved-app-insight-by-linking-google.html"
+      "https://android-developers.blogspot.com/2013/10/improved-app-insight-by-linking-google.html"
      ]
   },
   "distribute/users/appinvites": {
@@ -708,21 +707,21 @@
   "distribute/users/buildbuzz": {
     "title": "",
     "resources": [
-      "distribute/tools/promote/badges.html",
+      "https://play.google.com/intl/en_us/badges/",
       "distribute/tools/promote/linking.html",
       "distribute/tools/promote/device-art.html",
-      "http://plus.google.com/+GooglePlay"
+      "https://plus.google.com/+GooglePlay"
     ]
   },
   "distribute/users/createagreatlisting": {
     "title": "",
     "resources": [
       "https://support.google.com/googleplay/android-developer/answer/1078870",
-      "http://android-developers.blogspot.com/2011/10/android-market-featured-image.html",
+      "https://android-developers.blogspot.com/2011/10/android-market-featured-image.html",
       "distribute/tools/launch-checklist.html",
-      "http://android-developers.blogspot.com/2013/07/making-beautiful-android-app-icons.html",
-      "http://android-developers.blogspot.com/2012/12/localize-your-promotional-graphics-on.html",
-      "http://android-developers.blogspot.com/2013/10/making-your-app-content-more-accessible.html"
+      "https://android-developers.blogspot.com/2013/07/making-beautiful-android-app-icons.html",
+      "https://android-developers.blogspot.com/2012/12/localize-your-promotional-graphics-on.html",
+      "https://android-developers.blogspot.com/2013/10/making-your-app-content-more-accessible.html"
     ]
   },
   "distribute/users/buildcommunity": {
@@ -731,7 +730,7 @@
       "distribute/googleplay/developer-console.html",
       "https://support.google.com/groups/answer/46601",
       "https://support.google.com/plus/topic/2888488",
-      "http://www.youtube.com/yt/dev/"
+      "https://www.youtube.com/yt/dev/"
     ]
   },
   "distribute/users/appindexing": {
@@ -756,8 +755,8 @@
     "resources": [
       "https://support.google.com/admob/topic/2784623",
       "https://developers.google.com/mobile-ads-sdk/download",
-      "http://support.google.com/googleplay/android-developer/topic/2985714",
-      "http://analyticsacademy.withgoogle.com/mobile-app",
+      "https://support.google.com/googleplay/android-developer/topic/2985714",
+      "https://analyticsacademy.withgoogle.com/mobile-app",
       "https://support.google.com/analytics/answer/2611404",
       "https://support.google.com/admob/answer/3111064"
     ]
@@ -773,16 +772,16 @@
     "title": "",
     "resources": [
       "distribute/googleplay/developer-console.html",
-      "http://android-developers.blogspot.com/"
+      "https://android-developers.blogspot.com/"
     ]
   },
   "distribute/toolsreference/bestpractices/games": {
     "title": "",
     "resources": [
       "google/play-services/games.html",
-      "http://android-developers.blogspot.com/",
+      "https://android-developers.blogspot.com/",
       "distribute/googleplay/developer-console.html",
-      "http://www.youtube.com/watch?v=1RIz-cmTQB4"
+      "https://www.youtube.com/watch?v=1RIz-cmTQB4"
     ]
   },
   "distribute/essentials/corequalityguidelines/visualdesign": {
@@ -798,7 +797,7 @@
   "distribute/essentials/corequalityguidelines/functionality": {
     "title": "",
     "resources": [
-      "http://android-developers.blogspot.com/2011/11/making-android-games-that-play-nice.html",
+      "https://android-developers.blogspot.com/2011/11/making-android-games-that-play-nice.html",
       "guide/components/tasks-and-back-stack.html",
       "training/basics/activity-lifecycle/recreating.html"
     ]
@@ -843,19 +842,19 @@
   "distribute/essentials/core/performance": {
     "title": "",
     "resources": [
-      "http://android-developers.blogspot.com/2010/12/new-gingerbread-api-strictmode.html",
+      "https://android-developers.blogspot.com/2010/12/new-gingerbread-api-strictmode.html",
       "training/articles/perf-anr.html",
-      "http://android-developers.blogspot.com/2010/07/multithreading-for-performance.html"
+      "https://android-developers.blogspot.com/2010/07/multithreading-for-performance.html"
     ]
   },
   "distribute/essentials/core/play": {
     "title": "",
     "resources": [
       "distribute/tools/launch-checklist.html",
-      "http://play.google.com/about/developer-content-policy.html?hl=zh-Hans",
+      "https://play.google.com/about/developer-content-policy.html?hl=zh-Hans",
       "https://support.google.com/googleplay/android-developer/answer/188189?hl=zh-Hans",
       "https://support.google.com/googleplay/android-developer/answer/1078870?hl=zh-Hans",
-      "http://android-developers.blogspot.com/2011/10/android-market-featured-image.html",
+      "https://android-developers.blogspot.com/2011/10/android-market-featured-image.html",
       "https://support.google.com/googleplay/android-developer/answer/113477?hl=zh-Hans"
     ]
   },
@@ -863,10 +862,10 @@
     "title": "",
     "resources": [
       "intl/zh-cn/distribute/tools/launch-checklist.html",
-      "http://play.google.com/about/developer-content-policy.html",
+      "https://play.google.com/about/developer-content-policy.html",
       "https://support.google.com/googleplay/android-developer/answer/188189?hl=zh-Hans",
       "https://support.google.com/googleplay/android-developer/answer/1078870?hl=zh-Hans",
-      "http://android-developers.blogspot.com/2011/10/android-market-featured-image.html",
+      "https://android-developers.blogspot.com/2011/10/android-market-featured-image.html",
       "https://support.google.com/googleplay/android-developer/answer/113477?hl=zh-Hans"
     ]
   },
@@ -940,7 +939,7 @@
     "resources": [
       "distribute/tools/launch-checklist.html",
       "https://play.google.com/apps/publish/",
-      "distribute/tools/promote/badges.html",
+      "https://play.google.com/intl/en_us/badges/",
       "distribute/tools/promote/device-art.html"
     ]
   },
@@ -949,14 +948,14 @@
     "resources": [
       "intl/zh-cn/distribute/tools/launch-checklist.html",
       "https://play.google.com/apps/publish/?hl=zh-Hans",
-      "intl/zh-cn/distribute/tools/promote/badges.html",
+      "https://play.google.com/intl/en_us/badges/",
       "intl/zh-cn/distribute/tools/promote/device-art.html"
     ]
   },
   "distribute/essentials/tabletguidelines/googleplay": {
     "title": "",
     "resources": [
-      "http://android-developers.blogspot.com/2013/10/more-visibility-for-tablet-apps-in.html",
+      "https://android-developers.blogspot.com/2013/10/more-visibility-for-tablet-apps-in.html",
       "google/play/filters.html"
     ]
   },
@@ -964,7 +963,7 @@
     "title": "",
     "resources": [
       "distribute/essentials/quality/core.html",
-      "http://android-developers.blogspot.com/2013/10/more-visibility-for-tablet-apps-in.html",
+      "https://android-developers.blogspot.com/2013/10/more-visibility-for-tablet-apps-in.html",
       "distribute/tools/launch-checklist.html",
       "distribute/tools/promote/device-art.html"
     ]
@@ -974,14 +973,14 @@
     "resources": [
       "design/patterns/notifications.html",
       "distribute/engage/gcm.html",
-      "http://play.google.com/about/developer-content-policy.html"
+      "https://play.google.com/about/developer-content-policy.html"
     ]
   },
   "distribute/engage/analytics": {
     "title": "",
     "resources": [
-      "http://www.google.com/analytics/mobile/",
-      "http://android-developers.blogspot.com/2013/10/improved-app-insight-by-linking-google.html",
+      "https://www.google.com/analytics/mobile/",
+      "https://android-developers.blogspot.com/2013/10/improved-app-insight-by-linking-google.html",
       "https://developers.google.com/analytics/devguides/collection/android/"
     ]
   },
@@ -1024,9 +1023,9 @@
       "distribute/tools/localization-checklist.html",
       "https://support.google.com/googleplay/android-developer/table/3541286",
       "distribute/stories/localization.html",
-      "distribute/tools/promote/badges.html",
+      "https://play.google.com/intl/en_us/badges/",
       "distribute/tools/promote/device-art.html",
-      "http://www.youtube.com/watch?v=SkHHPf3EdzE"
+      "https://www.youtube.com/watch?v=SkHHPf3EdzE"
     ]
   },
   "distribute/engage/gcm": {
@@ -1042,7 +1041,7 @@
       "https://developers.google.com/games/services/",
       "distribute/analyze/start.html",
       "distribute/googleplay/cardboard.html",
-      "http://www.google.com/admob/"
+      "https://www.google.com/admob/"
     ]
   },
   "distribute/engage/gplus": {
@@ -1080,9 +1079,9 @@
   "distribute/engage/video/more": {
     "title": "",
     "resources": [
-      "http://www.youtube.com/yt/dev/",
+      "https://www.youtube.com/yt/dev/",
       "distribute/essentials/best-practices/games.html",
-      "http://www.youtube.com/watch?v=RRelFvc6Czo"
+      "https://www.youtube.com/watch?v=RRelFvc6Czo"
     ]
   },
   "distribute/engage/community": {
@@ -1095,15 +1094,15 @@
   "distribute/engage/kiwi": {
     "title": "",
     "resources": [
-      "http://www.youtube.com/watch?v=WWArLD6nqrk"
+      "https://www.youtube.com/watch?v=WWArLD6nqrk"
     ]
   },
   "distribute/toolsreference/gpfefaq": {
     "title": "",
     "resources": [
-      "http://www.google.com/edu/tablets/",
+      "https://www.google.com/edu/tablets/",
       "distribute/googleplay/edu/start.html",
-      "http://play.google.com/about/developer-distribution-agreement-addendum.html",
+      "https://play.google.com/about/developer-distribution-agreement-addendum.html",
       "distribute/essentials/quality/core.html",
       "distribute/essentials/quality/tablets.html"
     ]
@@ -1123,7 +1122,7 @@
   "distribute/tools/loc/designforloc": {
     "title": "",
     "resources": [
-      "http://android-developers.blogspot.com/2013/03/native-rtl-support-in-android-42.html",
+      "https://android-developers.blogspot.com/2013/03/native-rtl-support-in-android-42.html",
       "guide/topics/resources/string-resource.html#Plurals",
       "guide/topics/resources/string-resource.html",
       "reference/java/util/Locale.html"
@@ -1134,7 +1133,7 @@
     "resources": [
       "guide/topics/resources/string-resource.html",
       "design/style/writing.html",
-      "http://en.wikipedia.org/wiki/XLIFF"
+      "https://en.wikipedia.org/wiki/XLIFF"
     ]
   },
   "distribute/toolsreference/localizationchecklist/managestrings/zhcn": {
@@ -1142,7 +1141,7 @@
     "resources": [
       "guide/topics/resources/string-resource.html",
       "intl/zh-cn/design/style/writing.html",
-      "http://en.wikipedia.org/wiki/XLIFF"
+      "https://en.wikipedia.org/wiki/XLIFF"
     ]
   },
   "distribute/toolsreference/localizationchecklist/translatestrings": {
@@ -1154,14 +1153,14 @@
   "distribute/toolsreference/localizationchecklist/preplaunch": {
     "title": "",
     "resources": [
-      "distribute/tools/promote/badges.html",
+      "https://play.google.com/intl/en_us/badges/",
       "distribute/tools/promote/device-art.html"
     ]
   },
   "distribute/toolsreference/localizationchecklist/preplaunch/zhcn": {
     "title": "",
     "resources": [
-      "intl/zh-cn/distribute/tools/promote/badges.html",
+      "https://play.google.com/intl/en_us/badges/",
       "intl/zh-cn/distribute/tools/promote/device-art.html"
     ]
   },
@@ -1260,7 +1259,7 @@
     "title": "",
     "resources": [
       "https://support.google.com/googleplay/android-developer/answer/1078870",
-      "http://android-developers.blogspot.com/2011/10/android-market-featured-image.html"
+      "https://android-developers.blogspot.com/2011/10/android-market-featured-image.html"
     ]
   },
   "distribute/toolsreference/launchchecklist/productdetails": {
@@ -1273,14 +1272,14 @@
   "distribute/toolsreference/launchchecklist/badges": {
     "title": "",
     "resources": [
-      "distribute/tools/promote/badges.html",
+      "https://play.google.com/intl/en_us/badges/",
       "distribute/tools/promote/linking.html"
     ]
   },
   "distribute/toolsreference/launchchecklist/finalchecks": {
     "title": "",
     "resources": [
-      "http://play.google.com/about/developer-content-policy.html",
+      "https://play.google.com/about/developer-content-policy.html",
       "https://support.google.com/googleplay/android-developer/answer/113476",
       "support.html"
     ]
@@ -1294,9 +1293,6 @@
       "distribute/essentials/optimizing-your-app.html"
     ]
   },
-
-
-
   "distribute/toolsreference/launchchecklist/understanding/zhcn": {
     "title": "",
     "resources": [
@@ -1373,7 +1369,7 @@
     "title": "",
     "resources": [
       "https://support.google.com/googleplay/android-developer/answer/1078870?hl=zh-Hans",
-      "http://android-developers.blogspot.com/2011/10/android-market-featured-image.html"
+      "https://android-developers.blogspot.com/2011/10/android-market-featured-image.html"
     ]
   },
   "distribute/toolsreference/launchchecklist/productdetails/zhcn": {
@@ -1386,14 +1382,14 @@
   "distribute/toolsreference/launchchecklist/badges/zhcn": {
     "title": "",
     "resources": [
-      "intl/zh-cn/distribute/tools/promote/badges.html",
+      "https://play.google.com/intl/en_us/badges/",
       "intl/zh-cn/distribute/tools/promote/linking.html"
     ]
   },
   "distribute/toolsreference/launchchecklist/finalchecks/zhcn": {
     "title": "",
     "resources": [
-      "http://play.google.com/about/developer-content-policy.html",
+      "https://play.google.com/about/developer-content-policy.html",
       "https://support.google.com/googleplay/android-developer/answer/113476?hl=zh-Hans",
       "support.html"
     ]
@@ -1438,9 +1434,9 @@
   "distribute/monetize/advertising": {
     "title": "",
     "resources": [
-      "http://www.google.com/ads/admob/#subid=us-en-et-dac",
-      "http://www.google.com/doubleclick/publishers/small-business/index.html",
-      "http://support.google.com/googleplay/android-developer/topic/2985714",
+      "https://www.google.com/ads/admob/#subid=us-en-et-dac",
+      "https://www.google.com/doubleclick/publishers/small-business/index.html",
+      "https://support.google.com/googleplay/android-developer/topic/2985714",
       "training/monetization/ads-and-ux.html"
     ]
   },
@@ -1448,8 +1444,8 @@
     "title": "",
     "resources": [
       "https://support.google.com/admob/topic/2784623",
-      "http://admob.blogspot.com/",
-      "http://analyticsacademy.withgoogle.com/mobile-app",
+      "https://admob.blogspot.com/",
+      "https://analyticsacademy.withgoogle.com/mobile-app",
     ]
   },
   "distribute/monetize/paymentmethods": {
@@ -1561,16 +1557,16 @@
   "distribute/stories/games": {
     "title": "",
     "resources": [
-      "http://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_Deerhunter2014_gpgs.pdf",
-      "http://storage.googleapis.com/androiddevelopers/shareables/stories/ConcreteSoftware_PBABowling_gpgs.pdf",
-      "http://storage.googleapis.com/androiddevelopers/shareables/stories/Dragonplay_DragonplaySlots_gpgs.pdf",
-      "http://storage.googleapis.com/androiddevelopers/shareables/stories/Gameloft_Asphalt8_gpgs.pdf",
-      "http://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_EternityWarriors3_gpgs.pdf",
-      "http://storage.googleapis.com/androiddevelopers/shareables/stories/HotheadGames_RivalsatWar_gpgs.pdf",
-      "http://storage.googleapis.com/androiddevelopers/shareables/stories/TMSOFT_Compulsive_gpgs.pdf",
-      "http://storage.googleapis.com/androiddevelopers/shareables/stories/Noodlecake_SuperStickmanGolf2_gpgs.pdf",
-      "http://storage.googleapis.com/androiddevelopers/shareables/stories/TinyRebel_DoctorWhoLegacy_gpgs.pdf",
-      "http://storage.googleapis.com/androiddevelopers/shareables/stories/Senri_LeosFortune_gpgs.pdf"
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_Deerhunter2014_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/ConcreteSoftware_PBABowling_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Dragonplay_DragonplaySlots_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Gameloft_Asphalt8_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_EternityWarriors3_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/HotheadGames_RivalsatWar_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/TMSOFT_Compulsive_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Noodlecake_SuperStickmanGolf2_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/TinyRebel_DoctorWhoLegacy_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Senri_LeosFortune_gpgs.pdf"
     ]
   },
   "overview/zhcn/1": {
@@ -1596,7 +1592,7 @@
   "overview/zhcn/3": {
     "title": "",
     "resources": [
-      "intl/zh-cn/distribute/tools/promote/badges.html",
+      "https://play.google.com/intl/en_us/badges/",
 
       "intl/zh-cn/distribute/tools/promote/device-art.html",
       "intl/zh-cn/distribute/tools/promote/linking.html",
@@ -1616,9 +1612,9 @@
   "overview/carousel/zhcn": {
     "title": "",
     "resources": [
-      "http://www.youtube.com/watch?v=vGV7FHGzpFU",
-      "http://www.youtube.com/watch?v=aqc3ZOTzpdk",
-      "http://www.youtube.com/watch?v=jaNrJ8uyLSc"
+      "https://www.youtube.com/watch?v=vGV7FHGzpFU",
+      "https://www.youtube.com/watch?v=aqc3ZOTzpdk",
+      "https://www.youtube.com/watch?v=jaNrJ8uyLSc"
     ]
   },
   "overview/1": {
@@ -1644,7 +1640,7 @@
   "overview/3": {
     "title": "",
     "resources": [
-      "distribute/tools/promote/badges.html",
+      "https://play.google.com/intl/en_us/badges/",
       "distribute/tools/promote/device-art.html",
       "distribute/tools/promote/linking.html",
       "distribute/tools/promote/brand.html",
@@ -1739,9 +1735,8 @@
     ]
   },
   "marshmallow/landing/more": {
-  "title": "",
-  "resources": [
-      "about/versions/marshmallow/android-6.0-changes.html",
+    "title": "",
+    "resources": [
       "training/permissions/requesting.html",
       "training/backup/autosyncapi.html",
       "training/monitoring-device-state/doze-standby.html",
diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js
index 40b35a2..6c4423e 100644
--- a/docs/html/jd_extras.js
+++ b/docs/html/jd_extras.js
@@ -68,7 +68,7 @@
     "group":"",
     "keywords": [],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/B6ydLpkhq04/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/B6ydLpkhq04/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -93,7 +93,7 @@
       "#gpfe",
       "#googleplay"
     ],
-    "image":"http://i1.ytimg.com/vi/Idu7VcTTXfk/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/Idu7VcTTXfk/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -107,7 +107,7 @@
       "#gpfe",
       "#googleplay"
     ],
-    "image":"http://i1.ytimg.com/vi/IKhU180eJMo/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/IKhU180eJMo/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -136,7 +136,7 @@
     "title":"Cast sample apps",
     "titleFriendly":"",
     "summary":"Get example Google Cast applications for both senders and receivers.",
-    "url":"http://www.github.com/googlecast",
+    "url":"https://www.github.com/googlecast",
     "group":"",
     "keywords": ["cast", "samples"],
     "tags": [],
@@ -169,7 +169,7 @@
     "title":"Cardboard design guidelines",
     "titleFriendly":"",
     "summary":"Focus on overall usability and avoiding common VR pitfalls while creating an immersive experience of your own.",
-    "url":"http://www.google.com/design/spec-vr",
+    "url":"https://www.google.com/design/spec-vr",
     "group":"",
     "keywords": ["carboard","vr"],
     "tags": [],
@@ -231,7 +231,7 @@
       "#gpfe",
       "#googleplay"
     ],
-    "image":"http://i1.ytimg.com/vi/iokH4SAIfRw/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/iokH4SAIfRw/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -245,7 +245,7 @@
       "#gpfe",
       "#googleplay"
     ],
-    "image":"http://i1.ytimg.com/vi/Eh2adsAyTKc/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/Eh2adsAyTKc/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -259,7 +259,7 @@
       "#gpfe",
       "#googleplay"
     ],
-    "image":"http://i1.ytimg.com/vi/_AZ6UcPz-_g/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/_AZ6UcPz-_g/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -273,43 +273,43 @@
       "#gpfe",
       "#googleplay"
     ],
-    "image":"http://i1.ytimg.com/vi/iulXz8QTD1g/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/iulXz8QTD1g/maxresdefault.jpg",
     "type":"video"
   },
   {
     "title":"DesignBytes: Intro To Material Design",
     "titleFriendly":"",
     "summary":"These days, UI designers need to be thinking about phones, tablets, laptops, TVs, smartwatches, and beyond. In this DesignByte we talk about how Google designers have been working on making cross-platform and multi-screen design easier. We wanted to build a design system that felt at home on every screen, from the smallest watch to the largest TV.",
-    "url":"http://www.youtube.com/watch?v=p4gmvHyuZzw",
+    "url":"https://www.youtube.com/watch?v=p4gmvHyuZzw",
     "group":"",
     "keywords": [],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/p4gmvHyuZzw/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/p4gmvHyuZzw/maxresdefault.jpg",
     "type":"video"
   },
   {
     "title":"DesignBytes: Paper and Ink: The Materials that Matter",
     "titleFriendly":"",
     "summary":"Join Rich Fulcher to learn about the materials of material design. See how virtual paper and ink form the foundation of your tactile user interface and master the rules that govern their behaviour.",
-    "url":"http://www.youtube.com/watch?v=YaG_ljfzeUw",
+    "url":"https://www.youtube.com/watch?v=YaG_ljfzeUw",
     "group":"",
     "keywords": [],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/YaG_ljfzeUw/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/YaG_ljfzeUw/maxresdefault.jpg",
     "type":"video"
   },
   {
     "title":"DesignBytes: Material Design in the Google I/O App",
     "titleFriendly":"",
     "summary":"Roman Nurik shares details on the design process for the Google I/O 2014 app. To check out the app's source code, visit github.com/google/iosched.",
-    "url":"http://www.youtube.com/watch?v=XOcCOBe8PTc",
+    "url":"https://www.youtube.com/watch?v=XOcCOBe8PTc",
     "group":"",
     "keywords": [],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/XOcCOBe8PTc/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/XOcCOBe8PTc/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -321,7 +321,7 @@
     "keywords": [],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/kmUGLURRPkI/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/kmUGLURRPkI/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -333,7 +333,7 @@
     "keywords": [],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/HGElAW224dE/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/HGElAW224dE/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -345,43 +345,43 @@
     "keywords": [],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/zQekzaAgIlQ/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/zQekzaAgIlQ/maxresdefault.jpg",
     "type":"video"
   },
   {
     "title":"Battery Drain and Networking",
     "titleFriendly":"",
     "summary":"Let’s take a moment to make something insanely clear: As far as battery is concerned, NETWORKING is the biggest, baddest, dirtiest offender there is. And optimizing performance here isn’t easy. Since the chip isn’t always awake and draining power, means you can optimize how it wakes up, sends traffic, and saves battery.",
-    "url":"http://www.youtube.com/watch?v=fEEulSk1kNY",
+    "url":"https://www.youtube.com/watch?v=fEEulSk1kNY",
     "group":"",
     "keywords": [],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/fEEulSk1kNY/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/fEEulSk1kNY/maxresdefault.jpg",
     "type":"video"
   },
   {
     "title":"Batching Background Work Until Later",
     "titleFriendly":"",
     "summary":"Yes, your app is special. But when it comes to battery use, sometimes it’s better to be part of the crowd. Why not spread the battery blame around a bit? Ian Ni-Lewis shows you how ridiculously easy it is to go from battery hog to team player in this video.",
-    "url":"http://www.youtube.com/watch?v=-3ry8PxcJJA",
+    "url":"https://www.youtube.com/watch?v=-3ry8PxcJJA",
     "group":"",
     "keywords": [],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/-3ry8PxcJJA/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/-3ry8PxcJJA/maxresdefault.jpg",
     "type":"video"
   },
   {
     "title":"The Performance Lifecycle",
     "titleFriendly":"",
     "summary":"Performance problems surface in your application at the least-wanted times (like right before you’re about to ship your first build). But don’t freak out: There’s a simple process that you can follow to help get your performance back under control.",
-    "url":"http://www.youtube.com/watch?v=_kKTGK-Cb_4",
+    "url":"https://www.youtube.com/watch?v=_kKTGK-Cb_4",
     "group":"",
     "keywords": [],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/_kKTGK-Cb_4/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/_kKTGK-Cb_4/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -393,7 +393,7 @@
     "keywords": ["studio", "tools"],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/K2dodTXARqc/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/K2dodTXARqc/maxresdefault.jpg",
     "type":"video"
   },
 
@@ -406,7 +406,7 @@
     "keywords": ["google play services"],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/M3Udfu6qidk/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/M3Udfu6qidk/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -418,7 +418,7 @@
     "keywords": ["google play services"],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/FOn64iqlphk/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/FOn64iqlphk/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -430,7 +430,7 @@
     "keywords": ["google play services"],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/fvtMtfCuEpw/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/fvtMtfCuEpw/maxresdefault.jpg",
     "type":"video"
   },
     {
@@ -442,19 +442,19 @@
     "keywords": ["google play services"],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/F0Kh_RnSM0w/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/F0Kh_RnSM0w/maxresdefault.jpg",
     "type":"video"
   },
   {
     "title":"Running a Successful Games Business with Google",
     "titleFriendly":"",
     "summary":"Sure, we all want to make the next great gaming masterpiece. But we also want to feed our families and/or dogs. Join Bob Meese from the Google Play team as he gives you some key pointers on how to make sure you're best taking advantage of Google Play and running a successful games business.",
-    "url":"http://www.youtube.com/watch?v=tDmnGNkTtlE",
+    "url":"https://www.youtube.com/watch?v=tDmnGNkTtlE",
     "group":"",
     "keywords": [],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/tDmnGNkTtlE/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/tDmnGNkTtlE/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -466,7 +466,7 @@
     "keywords": ["tv"],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/6K_jxccHv5M/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/6K_jxccHv5M/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -478,7 +478,7 @@
     "keywords": ["auto"],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/ctiaVxgclsg/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/ctiaVxgclsg/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -490,7 +490,7 @@
     "keywords": ["testing"],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/2I6fuD20qlY/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/2I6fuD20qlY/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -502,7 +502,7 @@
     "keywords": ["testing"],
     "tags": [
     ],
-    "image":"http://i1.ytimg.com/vi/vdasFFfXKOY/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/vdasFFfXKOY/maxresdefault.jpg",
     "type":"video"
   },
   {
@@ -642,7 +642,7 @@
     "group":"",
     "keywords": [],
     "tags": [],
-    "image":"http://storage.googleapis.com/support-kms-prod/SNP_712EA2784949DDF085C46E3BE7B1DC618A09_4389397_en_v0",
+    "image":"https://storage.googleapis.com/support-kms-prod/SNP_712EA2784949DDF085C46E3BE7B1DC618A09_4389397_en_v0",
     "type":"google"
   },
   {
@@ -653,7 +653,7 @@
     "group":"",
     "keywords": [],
     "tags": [],
-    "image":"http://storage.googleapis.com/support-kms-prod/SNP_712EA2784949DDF085C46E3BE7B1DC618A09_4389397_en_v0",
+    "image":"https://storage.googleapis.com/support-kms-prod/SNP_712EA2784949DDF085C46E3BE7B1DC618A09_4389397_en_v0",
     "type":"google"
   },
   {
@@ -682,7 +682,7 @@
     "title":"Google for Education",
     "titleFriendly":"",
     "summary":"Find out more about how Google can support your work with apps and tablets.",
-    "url":"http://www.google.com/edu/tablets/",
+    "url":"https://www.google.com/edu/tablets/",
     "group":"",
     "keywords": [],
     "tags": [],
@@ -737,7 +737,7 @@
     "title":"Monetize your apps intelligently",
     "titleFriendly":"",
     "summary":"Generate revenue from your free games with ads tailored to match your game's look and feel.",
-    "url":"http://www.google.com/admob/",
+    "url":"https://www.google.com/admob/",
     "group":"",
     "keywords": ["AdMob"],
     "tags": [],
@@ -750,7 +750,7 @@
     "tags": [
       "versions", "blog", "googleplay"
     ],
-    "url": "http://android-developers.blogspot.com/",
+    "url": "https://android-developers.blogspot.com/",
     "timestamp": 1004884220000,
     "image": "images/blog.jpg",
     "title": "Android Developers Blog",
@@ -763,7 +763,7 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://android-developers.blogspot.com/2011/11/making-android-games-that-play-nice.html",
+    "url": "https://android-developers.blogspot.com/2011/11/making-android-games-that-play-nice.html",
     "timestamp": 1194884220000,
     "image": null,
     "title": "Making Android Apps that Play Nice",
@@ -776,7 +776,7 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://android-developers.blogspot.com/2010/07/multithreading-for-performance.html",
+    "url": "https://android-developers.blogspot.com/2010/07/multithreading-for-performance.html",
     "timestamp": 1194884220000,
     "image": null,
     "title": "Multithreading for Performance",
@@ -789,7 +789,7 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://play.google.com/about/developer-content-policy.html",
+    "url": "https://play.google.com/about/developer-content-policy.html",
     "timestamp": 1194884220000,
     "image": "images/play_dev.jpg",
     "title": "Developer Program Policies",
@@ -841,7 +841,7 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://android-developers.blogspot.com/2011/10/android-market-featured-image.html",
+    "url": "https://android-developers.blogspot.com/2011/10/android-market-featured-image.html",
     "timestamp": 1194884220000,
     "image": "images/play_dev.jpg",
     "title": "Google Play Featured Image Guidelines",
@@ -1023,9 +1023,9 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://youtu.be/SkHHPf3EdzE",
+    "url": "https://youtu.be/SkHHPf3EdzE",
     "timestamp": 1194884220000,
-    "image": "http://i1.ytimg.com/vi/SkHHPf3EdzE/maxresdefault.jpg",
+    "image": "https://i1.ytimg.com/vi/SkHHPf3EdzE/maxresdefault.jpg",
     "title": "Level Up Your Android Game",
     "summary": "Learn how to take your game to the next level on Google Play.",
     "keywords": [],
@@ -1049,7 +1049,7 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://play.google.com/about/developer-distribution-agreement.html",
+    "url": "https://play.google.com/about/developer-distribution-agreement.html",
     "timestamp": 1194884220000,
     "image": "images/play_dev.jpg",
     "title": "Developer Distribution Agreement",
@@ -1088,7 +1088,7 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://play.google.com/about/developer-distribution-agreement-addendum.html",
+    "url": "https://play.google.com/about/developer-distribution-agreement-addendum.html",
     "timestamp": 1194884220000,
     "image": "images/play_dev.jpg",
     "title": "Google Play for Education Addendum",
@@ -1101,7 +1101,7 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://android-developers.blogspot.com/2013/03/native-rtl-support-in-android-42.html",
+    "url": "https://android-developers.blogspot.com/2013/03/native-rtl-support-in-android-42.html",
     "timestamp": null,
     "image": null,
     "title": "Native RTL Support in Android 4.2",
@@ -1261,7 +1261,7 @@
     "group":"",
     "keywords": ["android","dashboard","platforms","versions"],
     "tags": ["#ecosystem","#versions","#whatsnew"],
-    "image":"http://chart.googleapis.com/chart?chl=GL%201.1%20only%7CGL%202.0%7CGL%203.0&chf=bg%2Cs%2C00000000&chd=t%3A0.1%2C93.5%2C6.4&chco=c4df9b%2C6fad0c&chs=400x250&cht=p",
+    "image":"https://chart.googleapis.com/chart?chl=GL%201.1%20only%7CGL%202.0%7CGL%203.0&chf=bg%2Cs%2C00000000&chd=t%3A0.1%2C93.5%2C6.4&chco=c4df9b%2C6fad0c&chs=400x250&cht=p",
     "lang":"en",
     "type":"about"
   },
@@ -1480,9 +1480,9 @@
       "#gpfe",
       "#googleplay"
     ],
-    "url": "http://youtu.be/vzvpcEffvaE",
+    "url": "https://youtu.be/vzvpcEffvaE",
     "timestamp": 1383243492000,
-    "image": "http://i1.ytimg.com/vi/vzvpcEffvaE/maxresdefault.jpg",
+    "image": "https://i1.ytimg.com/vi/vzvpcEffvaE/maxresdefault.jpg",
     "title": "Introducing Tablets with Google Play for Education",
     "summary": "Schools in Hillsborough, New Jersey were among the first to try out Nexus 7 tablets with Google Play for Education. See the difference it made for students, teachers, and administrators.",
     "keywords": [],
@@ -1495,9 +1495,9 @@
     "tags": [
       "#engagement",
     ],
-    "url": "http://www.youtube.com/yt/dev/",
+    "url": "https://www.youtube.com/yt/dev/",
     "timestamp": 1383243492000,
-    "image": "http://www.youtube.com/yt/dev/media/images/yt-dev-home-hero.jpg",
+    "image": "https://www.youtube.com/yt/dev/media/images/yt-dev-home-hero.jpg",
     "title": "YouTube for Developers",
     "summary": "The YouTube APIs and Tools enable you to integrate YouTube's video content and functionality into your website, app, or device.",
     "keywords": [],
@@ -1510,7 +1510,7 @@
     "tags": [
       "#engagement",
     ],
-    "url": "http://www.google.com/analytics/mobile/",
+    "url": "https://www.google.com/analytics/mobile/",
     "timestamp": 1383243492000,
     "image": "images/cards/analytics-mobile_2x.jpg",
     "title": "Mobile App Analytics",
@@ -1527,9 +1527,9 @@
     "tags": [
       "#gcm",
     ],
-    "url": "http://www.youtube.com/watch?v=y76rjidm8cU",
+    "url": "https://www.youtube.com/watch?v=y76rjidm8cU",
     "timestamp": 1383243492000,
-    "image": "http://1.bp.blogspot.com/-IF-1-1kA0sg/UYwTidxdi3I/AAAAAAAAAEU/ellLeQ-E1vs/s800/google-io-lockup-2.png",
+    "image": "https://1.bp.blogspot.com/-IF-1-1kA0sg/UYwTidxdi3I/AAAAAAAAAEU/ellLeQ-E1vs/s800/google-io-lockup-2.png",
     "title": "Google Cloud Messaging at I/O 2013",
     "summary": "Google Cloud Messaging allows your services to efficiently send data to applications on Android devices. See what's new, and learn how to use GCM to make your apps more efficient.",
     "keywords": ["gcm"],
@@ -1542,7 +1542,7 @@
     "tags": [
       "#gcm",
     ],
-    "url": "http://developer.chrome.com/apps/cloudMessagingV2",
+    "url": "https://developer.chrome.com/apps/cloudMessagingV2",
     "timestamp": 1383243492000,
     "image": "images/kk-chromium-icon.png",
     "title": "Google Cloud Messaging for Chrome",
@@ -1558,7 +1558,7 @@
     "tags": [
       "#sdkupdates"
     ],
-    "url": "http://android-developers.blogspot.com/2013/07/making-beautiful-android-app-icons.html",
+    "url": "https://android-developers.blogspot.com/2013/07/making-beautiful-android-app-icons.html",
     "timestamp": 1194884220000,
     "image": null,
     "title": "Make Beautiful Android App Icons",
@@ -1573,7 +1573,7 @@
     "tags": [
       "#sdkupdates"
     ],
-    "url": "http://android-developers.blogspot.com/2012/12/localize-your-promotional-graphics-on.html",
+    "url": "https://android-developers.blogspot.com/2012/12/localize-your-promotional-graphics-on.html",
     "timestamp": 1194884220000,
     "image": null,
     "title": "Localize Your Promotional Graphics",
@@ -1588,7 +1588,7 @@
     "tags": [
       "#sdkupdates"
     ],
-    "url": "http://android-developers.blogspot.com/2013/10/making-your-app-content-more-accessible.html",
+    "url": "https://android-developers.blogspot.com/2013/10/making-your-app-content-more-accessible.html",
     "timestamp": 1194884220000,
     "image": null,
     "title": "Make your App Content more Accessible with App Linking",
@@ -1679,7 +1679,7 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://en.wikipedia.org/wiki/XLIFF",
+    "url": "https://en.wikipedia.org/wiki/XLIFF",
     "timestamp": 1194884220000,
     "image": null,
     "title": "XML Localisation Interchange File Format (XLIFF)",
@@ -1744,7 +1744,7 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://android-developers.blogspot.com/2013/11/bring-your-apps-into-classroom-with.html",
+    "url": "https://android-developers.blogspot.com/2013/11/bring-your-apps-into-classroom-with.html",
     "timestamp": null,
     "image": "distribute/images/gp-edu-apps-image.jpg",
     "title": "Google play for education",
@@ -1783,7 +1783,7 @@
     "lang": "en",
     "group": "",
     "tags": ["games", "localization", "quality"],
-    "url": "http://www.youtube.com/watch?v=SkHHPf3EdzE",
+    "url": "https://www.youtube.com/watch?v=SkHHPf3EdzE",
     "timestamp": null,
     "image": "https://developers.google.com/apps/images/io_2013/google-io-logo.png",
     "title": "Level Up Your Android Game",
@@ -1822,9 +1822,9 @@
     "lang": "en",
     "group": "",
     "tags": ["monetize", "ads"],
-    "url": "http://www.google.com/doubleclick/publishers/small-business/index.html",
+    "url": "https://www.google.com/doubleclick/publishers/small-business/index.html",
     "timestamp": null,
-    "image": "http://www.google.com/doubleclick/publishers/small-business/images/define_ad.png",
+    "image": "https://www.google.com/doubleclick/publishers/small-business/images/define_ad.png",
     "title": "DoubleClick for Publishers",
     "summary": "A free ad management solution that helps growing publishers sell, schedule, deliver, and measure all of their digital ad inventory.",
     "keywords": ["ads"],
@@ -1835,7 +1835,7 @@
     "lang": "en",
     "group": "",
     "tags": ["monetize", "ads"],
-    "url": "http://support.google.com/googleplay/android-developer/topic/2985714",
+    "url": "https://support.google.com/googleplay/android-developer/topic/2985714",
     "timestamp": null,
     "image":"images/play_dev.jpg",
     "title": "Policy Center: Ads",
@@ -1861,7 +1861,7 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://admob.blogspot.com/",
+    "url": "https://admob.blogspot.com/",
     "timestamp": null,
     "image": "images/cards/analytics-mobile_2x.jpg",
     "title": "Inside Admob",
@@ -1926,7 +1926,7 @@
     "lang": "en",
     "group": "",
     "tags": ["plus", "social"],
-    "url": "http://plus.google.com/+GooglePlay",
+    "url": "https://plus.google.com/+GooglePlay",
     "timestamp": null,
     "image": "https://lh4.googleusercontent.com/-IKezweZlcXI/AAAAAAAAAAI/AAAAAAABOvg/uK8Z0jekVE4/s120-c/photo.jpg",
     "title": "+Google Play",
@@ -1967,7 +1967,7 @@
     "tags": [],
     "url": "https://developers.google.com/edu/guidelines",
     "timestamp": null,
-    "image": "http://developer.android.com/distribute/images/edu-guidelines.jpg",
+    "image": "https://developer.android.com/distribute/images/edu-guidelines.jpg",
     "title": "Education Guidelines",
     "summary": "These guidelines and requirements help you develop great apps for students, which offer compelling content and an intuitive user experience on Android tablets.",
     "keywords": [],
@@ -1980,7 +1980,7 @@
     "tags": [],
     "url": "https://developers.google.com/edu/guidelines?hl=zh-Hans",
     "timestamp": null,
-    "image": "http://developer.android.com/distribute/images/edu-guidelines.jpg",
+    "image": "https://developer.android.com/distribute/images/edu-guidelines.jpg",
     "title": "Education Guidelines",
     "summary": "These guidelines and requirements help you develop great apps for students, which offer compelling content and an intuitive user experience on Android tablets.",
     "keywords": [],
@@ -1993,7 +1993,7 @@
     "tags": [],
     "url": "https://developers.google.com/edu/faq",
     "timestamp": null,
-    "image": "http://developer.android.com/distribute/images/gpfe-faq.jpg",
+    "image": "https://developer.android.com/distribute/images/gpfe-faq.jpg",
     "title": "Education FAQ",
     "summary": "Answers to common questions you might have about Google Play for Education.",
     "keywords": [],
@@ -2030,9 +2030,9 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_Deerhunter2014_gpgs.pdf",
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_Deerhunter2014_gpgs.pdf",
     "timestamp": null,
-    "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_Deerhunter2014_gpgs.png",
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_Deerhunter2014_gpgs.png",
     "title": "Deer Hunter 2014 by Glu &mdash; Sign-in",
     "summary": "Glu finds that Google Play Game Services helps improve the user experience which leads to increased player happiness. They also find that Play Games Services signed in users tend to play longer and have a higher lifetime value.",
     "keywords": ["stories"],
@@ -2043,9 +2043,9 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/ConcreteSoftware_PBABowling_gpgs.pdf",
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/ConcreteSoftware_PBABowling_gpgs.pdf",
     "timestamp": null,
-    "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/ConcreteSoftware_PBABowling_gpgs.png",
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/ConcreteSoftware_PBABowling_gpgs.png",
     "title": "PBA® Bowling Challenge by Concrete Software &mdash; Quests",
     "summary": "Concrete Software finds that Google Play Game Services' quests are a great way to create new content for users that leads to higher engagement.",
     "keywords": ["stories"],
@@ -2056,9 +2056,9 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Dragonplay_DragonplaySlots_gpgs.pdf",
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Dragonplay_DragonplaySlots_gpgs.pdf",
     "timestamp": null,
-    "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Dragonplay_DragonplaySlots_gpgs.png",
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Dragonplay_DragonplaySlots_gpgs.png",
     "title": "Dragonplay Slots by Dragonplay &mdash; Sign-in",
     "summary": "Dragonplay finds that players who sign in with Google Play Games services tend to be high quality users who were highly engaged. They also tend to be easier to convert to paying users.",
     "keywords": ["stories"],
@@ -2069,9 +2069,9 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Gameloft_Asphalt8_gpgs.pdf",
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Gameloft_Asphalt8_gpgs.pdf",
     "timestamp": null,
-    "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Gameloft_Asphalt8_gpgs.png",
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Gameloft_Asphalt8_gpgs.png",
     "title": "Asphalt 8 by Gameloft &mdash; Friends invitations",
     "summary": "Gameloft finds that Google Play Game Services users are more engaged than the average Android user and more likely to convert to paying players.",
     "keywords": ["stories"],
@@ -2082,9 +2082,9 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_EternityWarriors3_gpgs.pdf",
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_EternityWarriors3_gpgs.pdf",
     "timestamp": null,
-    "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_EternityWarriors3_gpgs.png",
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_EternityWarriors3_gpgs.png",
     "title": "Eternity Warriors 3 by Glu &mdash; Gifting",
     "summary": "Glu finds that Google Play Game Services gifting outperforms other implementations (including those with incentives) because of its seamless flow and consistent performance.",
     "keywords": ["stories"],
@@ -2095,9 +2095,9 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/HotheadGames_RivalsatWar_gpgs.pdf",
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/HotheadGames_RivalsatWar_gpgs.pdf",
     "timestamp": null,
-    "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/HotheadGames_RivalsatWar_gpgs.jpg",
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/HotheadGames_RivalsatWar_gpgs.jpg",
     "title": "Rivals at War: Firefight by Hothead Games &mdash; Leaderboards",
     "summary": "Hothead Games is planning to include Google Play Game Services features in all their games going forwards after seeing that players that signed in with Play Games Services tend to show higher retention and a higher average revenue.",
     "keywords": ["stories"],
@@ -2108,9 +2108,9 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/TMSOFT_Compulsive_gpgs.pdf",
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/TMSOFT_Compulsive_gpgs.pdf",
     "timestamp": null,
-    "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/TMSOFT_Compulsive_gpgs.png",
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/TMSOFT_Compulsive_gpgs.png",
     "title": "Compulsive by TMSOFT &mdash; Cross-platform",
     "summary": "TMSOFT finds that users who authenticate with Play Games Services on Android and iOS play Compulsive twice as much and purchase in-app products over four times as much.",
     "keywords": ["stories"],
@@ -2121,9 +2121,9 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Noodlecake_SuperStickmanGolf2_gpgs.pdf",
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Noodlecake_SuperStickmanGolf2_gpgs.pdf",
     "timestamp": null,
-    "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Noodlecake_SuperStickmanGolf2_gpgs.png",
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Noodlecake_SuperStickmanGolf2_gpgs.png",
     "title": "Super Stickman Golf 2 by Noodlecake Studios &mdash; Multiplayer",
     "summary": "Noodlecake Studios finds that Google Play Game Services’ multiplayer feature helps reduce attrition.",
     "keywords": ["stories"],
@@ -2134,9 +2134,9 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/TinyRebel_DoctorWhoLegacy_gpgs.pdf",
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/TinyRebel_DoctorWhoLegacy_gpgs.pdf",
     "timestamp": null,
-    "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/TinyRebelGames_DrWhoLegacy_pgps.png",
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/TinyRebelGames_DrWhoLegacy_pgps.png",
     "title": "Dr. Doctor Who: Legacy by Tiny Rebel Games &mdash; Achievements",
     "summary": "After integrating achievements and cloud services from Google Play Game Services, Tiny Rebel Games saw a dramatic increase in daily revenues as a result of an increase in daily installs and an increase in the average revenue per install.",
     "keywords": ["stories"],
@@ -2147,9 +2147,9 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Senri_LeosFortune_gpgs.pdf",
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Senri_LeosFortune_gpgs.pdf",
     "timestamp": null,
-    "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Senri_LeosFortune_gpgs.png",
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Senri_LeosFortune_gpgs.png",
     "title": "Leo’s Fortune by 1337 &amp; Senri &mdash; Saved games",
     "summary": "1337 + Senri finds that Google Play Game Services is easy to integrate and provides essential game functions like cloud saved games, achievements and leaderboards which have a very large adoption rate amongst players.",
     "keywords": ["stories"],
@@ -2225,9 +2225,9 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://www.google.com/tagmanager/",
+    "url": "https://www.google.com/tagmanager/",
     "timestamp": null,
-    "image": "http://www.google.com/tagmanager/images/gtm-hero-illustration-small.png",
+    "image": "https://www.google.com/tagmanager/images/gtm-hero-illustration-small.png",
     "title": "Google Tag Manager",
     "summary": "Google Tag Manager enables you to change configuration values in your mobile apps using the Google Tag Manager interface, without having to rebuild and resubmit application binaries to app marketplaces.",
     "keywords": ["analytics", "tagmanager"],
@@ -2422,7 +2422,7 @@
     "tags": [],
     "url": "https://support.google.com/tagmanager/answer/6003007",
     "timestamp": null,
-    "image": "http://www.google.com/tagmanager/images/gtm-hero-illustration-small.png",
+    "image": "https://www.google.com/tagmanager/images/gtm-hero-illustration-small.png",
     "title": "In-App A/B Testing",
     "summary": "With content experiments in Google Tag Manager you can test multiple variations of your app to find which works best.",
     "keywords": ["tagmanager"],
@@ -2748,7 +2748,7 @@
     "lang": "en",
     "group": "",
     "tags": [],
-    "url": "http://analyticsacademy.withgoogle.com/mobile-app",
+    "url": "https://analyticsacademy.withgoogle.com/mobile-app",
     "timestamp": null,
     "image": "distribute/images/advertising.jpg",
     "title": "Analytics Academy for Mobile Apps",
@@ -3108,7 +3108,7 @@
     "group":"",
     "keywords": ["wear", "wearable", "watch face"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/AK38PJZmIW8/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/AK38PJZmIW8/maxresdefault.jpg",
     "lang":"en",
     "type":"video"
   },
@@ -3120,7 +3120,7 @@
     "group":"",
     "keywords": ["support", "compatibility"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/3PIc-DuEU2s/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/3PIc-DuEU2s/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3132,7 +3132,7 @@
     "group":"",
     "keywords": ["support", "compatibility","design-code"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/5Be2mJzP-Uw/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/5Be2mJzP-Uw/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3144,7 +3144,7 @@
     "group":"",
     "keywords": ["tools", "studio","gradle"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/cD7NPxuuXYY/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/cD7NPxuuXYY/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3156,7 +3156,7 @@
     "group":"",
     "keywords": ["tools", "studio","layout"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/JLLnhwtDoHw/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/JLLnhwtDoHw/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3168,22 +3168,11 @@
     "group":"",
     "keywords": ["tools", "studio","debugging","profiling","performance"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/2I6fuD20qlY/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/2I6fuD20qlY/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
   {
-    "tags": [
-      "android",
-      "developerstory",
-      "googleplay",
-      "featured"
-    ],
-    "title": "Android Developer Story: Jelly Button Games — Growing globally through data driven development",
-    "type": "youtube",
-    "url": "http://www.youtube.com/watch?v=Pd49vTkvu0U"
-  },
-  {
     "title":"Scale with Google Cloud Platform",
     "titleFriendly":"",
     "summary":"Build, test, and deploy applications on Google's highly-scalable and reliable infrastructure for your web, mobile and backend solutions.",
@@ -3211,7 +3200,7 @@
     "title":"Android for Work",
     "titleFriendly":"",
     "summary":"Learn more about how Android for Work makes your favorite phones and tablets the perfect business tools.",
-    "url":"http://www.android.com/work/",
+    "url":"https://www.android.com/work/",
     "group":"",
     "keywords": ["work", "enterprise", "emm"],
     "tags": [],
@@ -3227,7 +3216,7 @@
     "group":"",
     "keywords": ["work", "enterprise", "emm"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/jQWB_-o1kz4/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/jQWB_-o1kz4/maxresdefault.jpg",
     "lang":"en",
     "type":"youtube"
   },
@@ -3239,7 +3228,7 @@
     "group":"",
     "keywords": ["work", "enterprise", "emm"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/39NkpWkaH8M/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/39NkpWkaH8M/maxresdefault.jpg",
     "lang":"en",
     "type":"youtube"
   },
@@ -3251,7 +3240,7 @@
     "group":"",
     "keywords": ["work", "enterprise", "emm"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/dH41OutAMNM/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/dH41OutAMNM/maxresdefault.jpg",
     "lang":"en",
     "type":"youtube"
   },
@@ -3263,7 +3252,7 @@
     "group":"",
     "keywords": ["work", "enterprise", "emm"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/j3QC6hcpy90/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/j3QC6hcpy90/maxresdefault.jpg",
     "lang":"en",
     "type":"youtube"
   },
@@ -3299,7 +3288,7 @@
     "group":"",
     "keywords": ["Marshmallow"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/yYU4DHLwoRk/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/yYU4DHLwoRk/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3311,7 +3300,7 @@
     "group":"",
     "keywords": ["Marshmallow"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/ndBdf1_oOGA/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/ndBdf1_oOGA/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3323,7 +3312,7 @@
     "group":"",
     "keywords": ["Marshmallow"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/VOn7VrTRlA4/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/VOn7VrTRlA4/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3335,7 +3324,7 @@
     "group":"",
     "keywords": ["Marshmallow"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/OW1A4XFRuyc/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/OW1A4XFRuyc/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3347,7 +3336,7 @@
     "group":"",
     "keywords": ["Marshmallow"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/HXacyy0HSW0/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/HXacyy0HSW0/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3359,7 +3348,7 @@
     "group":"",
     "keywords": ["Marshmallow"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/vcSj8ln-BlE/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/vcSj8ln-BlE/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3371,7 +3360,7 @@
     "group":"",
     "keywords": ["Marshmallow"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/j3QC6hcpy90/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/j3QC6hcpy90/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3383,7 +3372,7 @@
     "group":"",
     "keywords": ["Marshmallow"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/C8lUdPVSzDk/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/C8lUdPVSzDk/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3395,7 +3384,7 @@
     "group":"",
     "keywords": ["Marshmallow"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/N72ksDKrX6c/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/N72ksDKrX6c/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3407,7 +3396,7 @@
     "group":"",
     "keywords": ["Marshmallow"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/U9tw5ypqEN0/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/U9tw5ypqEN0/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3419,7 +3408,7 @@
     "group":"",
     "keywords": ["Marshmallow"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/iZqDdvhTZj0/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/iZqDdvhTZj0/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3431,7 +3420,7 @@
     "group":"",
     "keywords": ["Marshmallow"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/5sCQjeGoE7M/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/5sCQjeGoE7M/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3443,7 +3432,7 @@
     "group":"",
     "keywords": ["Marshmallow"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/LQoohRwojmw/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/LQoohRwojmw/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3455,7 +3444,7 @@
     "group":"",
     "keywords": ["Marshmallow"],
     "tags": [],
-    "image":"http://i1.ytimg.com/vi/f17qe9vZ8RM/maxresdefault.jpg",
+    "image":"https://i1.ytimg.com/vi/f17qe9vZ8RM/maxresdefault.jpg",
     "lang":"en",
     "type":"Video"
   },
@@ -3468,7 +3457,7 @@
     "group": "",
     "keywords": [],
     "tags": [],
-    "image": "http://img.youtube.com/vi/xelYnWcYkuE/hqdefault.jpg",
+    "image": "https://img.youtube.com/vi/xelYnWcYkuE/hqdefault.jpg",
     "type": "youtube"
   },
   {
@@ -3480,7 +3469,7 @@
     "group": "",
     "keywords": [],
     "tags": [],
-    "image": "http://img.youtube.com/vi/lJdjY3z6-LY/hqdefault.jpg",
+    "image": "https://img.youtube.com/vi/lJdjY3z6-LY/hqdefault.jpg",
     "type": "youtube"
   },
   {
@@ -3488,11 +3477,11 @@
     "title": "Android Wear 関連の動画に日本語字幕が付きました",
     "titleFriendly": "",
     "summary": "",
-    "url": "http://googledevjp.blogspot.jp/2014/12/android-wear.html",
+    "url": "https://googledevjp.blogspot.jp/2014/12/android-wear.html",
     "group": "",
     "keywords": [],
     "tags": [],
-    "image": "http://i1.ytimg.com/vi/4JcDYkgqksY/maxresdefault.jpg",
+    "image": "https://i1.ytimg.com/vi/4JcDYkgqksY/maxresdefault.jpg",
     "type": "blog"
   },
   {
@@ -3500,11 +3489,11 @@
     "title": "Android Studio 1.0 をリリースしました",
     "titleFriendly": "",
     "summary": "",
-    "url": "http://googledevjp.blogspot.jp/2014/12/android-studio-10.html",
+    "url": "https://googledevjp.blogspot.jp/2014/12/android-studio-10.html",
     "group": "",
     "keywords": [],
     "tags": [],
-    "image": "http://3.bp.blogspot.com/-1hV3sD1At74/VIaQSWBasUI/AAAAAAAABAU/9vYLJMsmMuQ/s1600/studio-logo.png",
+    "image": "https://3.bp.blogspot.com/-1hV3sD1At74/VIaQSWBasUI/AAAAAAAABAU/9vYLJMsmMuQ/s1600/studio-logo.png",
     "type": "blog"
   },
   {
@@ -3512,11 +3501,11 @@
     "title": "Google Play 開発者サービス 6.5 のご紹介",
     "titleFriendly": "",
     "summary": "",
-    "url": "http://googledevjp.blogspot.jp/2014/12/google-play-65.html",
+    "url": "https://googledevjp.blogspot.jp/2014/12/google-play-65.html",
     "group": "",
     "keywords": [],
     "tags": [],
-    "image": "http://1.bp.blogspot.com/-4BNREC0Jojo/VGo7ahW35wI/AAAAAAAABAc/9thZl94F6fY/s1600/GMS%2B-%2BRelease%2BBlog%2BNacho%2B-%2BMap%2BToolbar.png",
+    "image": "https://1.bp.blogspot.com/-4BNREC0Jojo/VGo7ahW35wI/AAAAAAAABAc/9thZl94F6fY/s1600/GMS%2B-%2BRelease%2BBlog%2BNacho%2B-%2BMap%2BToolbar.png",
     "type": "blog"
   },
   {
@@ -3560,7 +3549,7 @@
     "title": "Google Play アプリ ポリシー センター",
     "titleFriendly": "",
     "summary": "",
-    "url": "http://support.google.com/googleplay/android-developer/answer/4430948?hl=ja",
+    "url": "https://support.google.com/googleplay/android-developer/answer/4430948?hl=ja",
     "group": "",
     "keywords": [],
     "tags": [],
@@ -3596,11 +3585,11 @@
     "title": "Google Cloud Platform が支える、新感覚リアルタイム RPG ユニゾンリーグ - 株式会社エイチームの GCP 導入事例",
     "titleFriendly": "",
     "summary": "スケーラブルなバックエンドを実現する Google Cloud Platform の最新導入事例。",
-    "url": "http://googleforwork-japan.blogspot.jp/2014/12/gcp-google-cloud-platform-rpg-gcp.html",
+    "url": "https://googleforwork-japan.blogspot.jp/2014/12/gcp-google-cloud-platform-rpg-gcp.html",
     "group": "",
     "keywords": [],
     "tags": [],
-    "image": "http://3.bp.blogspot.com/-xp7KoPkbne4/VI_PfoFil3I/AAAAAAAAA3U/-k1UZ0zjCBc/s1600/unison-league.jpeg",
+    "image": "https://3.bp.blogspot.com/-xp7KoPkbne4/VI_PfoFil3I/AAAAAAAAA3U/-k1UZ0zjCBc/s1600/unison-league.jpeg",
     "type": "distribute"
   },
   {
@@ -3624,7 +3613,7 @@
     "group": "",
     "keywords": [],
     "tags": [],
-    "image": "http://img.youtube.com/vi/7X9Ue0Nfdh4/hqdefault.jpg",
+    "image": "https://img.youtube.com/vi/7X9Ue0Nfdh4/hqdefault.jpg",
     "type": "youtube"
   },
   {
@@ -3636,7 +3625,7 @@
     "group": "",
     "keywords": [],
     "tags": [],
-    "image": "http://img.youtube.com/vi/83FpwuschCQ/hqdefault.jpg",
+    "image": "https://img.youtube.com/vi/83FpwuschCQ/hqdefault.jpg",
     "type": "youtube"
   },
   {
@@ -3644,7 +3633,7 @@
     "title": "안드로이드 5.0 롤리팝을 맞이하는 개발자를 위한 안내서",
     "titleFriendly": "",
     "summary": "",
-    "url": "http://googledevkr.blogspot.com/2014/11/android50guidefordevelopers.html",
+    "url": "https://googledevkr.blogspot.com/2014/11/android50guidefordevelopers.html",
     "group": "",
     "keywords": [],
     "tags": [],
@@ -3656,7 +3645,7 @@
     "title": "안드로이드 앱을 위한 머티리얼 디자인 체크 리스트",
     "titleFriendly": "",
     "summary": "",
-    "url": "http://googledevkr.blogspot.com/2014/10/material-design-on-android-checklist.html",
+    "url": "https://googledevkr.blogspot.com/2014/10/material-design-on-android-checklist.html",
     "group": "",
     "keywords": [],
     "tags": [],
@@ -3668,11 +3657,11 @@
     "title": "App Compat 라이브러리",
     "titleFriendly": "",
     "summary": "",
-    "url": "http://googledevkr.blogspot.com/2014/10/appcompat-v21-material-design-for-pre.html",
+    "url": "https://googledevkr.blogspot.com/2014/10/appcompat-v21-material-design-for-pre.html",
     "group": "",
     "keywords": [],
     "tags": [],
-    "image": "http://2.bp.blogspot.com/-7fF9ayZ6PgI/U9iFpk5FNEI/AAAAAAAAAs0/4P4SCvdB_4M/s640/image00.png",
+    "image": "https://2.bp.blogspot.com/-7fF9ayZ6PgI/U9iFpk5FNEI/AAAAAAAAAs0/4P4SCvdB_4M/s640/image00.png",
     "type": "blog"
   },
   {
@@ -3793,7 +3782,7 @@
   },
   {
     "url":"https://www.youtube.com/watch?v=wcjqBSei3a0&list=PLOU2XLYxmsIKLNUPiFCWVtcO7mZRZ9MmS",
-    "image": "http://i1.ytimg.com/vi/wcjqBSei3a0/maxresdefault.jpg",
+    "image": "https://i1.ytimg.com/vi/wcjqBSei3a0/maxresdefault.jpg",
     "title": "Developers connecting the world through Google Play",
     "summary": "The mobile ecosystem is empowering developers to make good on the dream of connecting the world through technology to improve people's lives.",
     "tags":["io15","googleplay"],
@@ -3802,7 +3791,7 @@
   },
   {
     "url":"https://www.youtube.com/watch?v=B6ydLpkhq04&list=PLOU2XLYxmsIKLNUPiFCWVtcO7mZRZ9MmS",
-    "image": "http://i1.ytimg.com/vi/B6ydLpkhq04/maxresdefault.jpg",
+    "image": "https://i1.ytimg.com/vi/B6ydLpkhq04/maxresdefault.jpg",
     "title": "Store Listing Experiments for Google Play",
     "summary": "Learn how to use Google Play’s new store listing optimization feature to get more installs of your app, and how to test different graphics and text to find out which options perform the best. ",
     "tags":["io15","googleplay","store listing"],
@@ -3811,7 +3800,7 @@
   },
   {
     "url":"https://www.youtube.com/watch?v=jyO3-rF4Mu0&list=PLOU2XLYxmsIKLNUPiFCWVtcO7mZRZ9MmS",
-    "image": "http://i1.ytimg.com/vi/jyO3-rF4Mu0/maxresdefault.jpg",
+    "image": "https://i1.ytimg.com/vi/jyO3-rF4Mu0/maxresdefault.jpg",
     "title": "Growing games with Google",
     "summary": "The games industry has never been more promising and full of opportunities. This talk covers how Google is helping developers across a broad range of existing and emerging platforms.",
     "tags":["io15","android", "googleplay","games"],
@@ -3819,7 +3808,7 @@
     "type":"youtube"
   },
   {
-    "url":"http://www.youtube.com/watch?v=yJisuP94lHU",
+    "url":"https://www.youtube.com/watch?v=yJisuP94lHU",
     "image": "images/distribute/hero-playtime-opener.jpg",
     "title": "Playtime 2015: Innovation happens everywhere",
     "type":"Video",
@@ -3827,7 +3816,7 @@
     "summary": "Watch the opening video from Google Play's annual event series, Playtime, which celebrates inspirational developers who are changing the world around them.",
   },
 {
-    "url":"http://www.youtube.com/watch?v=JrR6o5tYMWQ",
+    "url":"https://www.youtube.com/watch?v=JrR6o5tYMWQ",
     "image": "images/distribute/hero-acquisition-devbyte.jpg",
     "title": "User acquisition and tracking on Google Play",
     "type" : "Video",
@@ -3849,7 +3838,7 @@
     "title": "Android 5.0 Lollipop",
     "summary": "The Android 5.0 update adds a variety of new features for your apps, such as notifications on the lock screen, an all-new camera API, OpenGL ES 3.1, the new naterial design interface, and much more.",
   },
-  "http://www.youtube.com/watch?v=yJisuP94lHU": {
+  "https://www.youtube.com/watch?v=yJisuP94lHU": {
     "url":"https://www.youtube.com/watch?v=yJisuP94lHU&index=1&list=PLWz5rJ2EKKc_QRBk7Zkl5uGjR1He7vG-w",
     "image": "images/distribute/hero-playtime-opener.jpg",
     "title": "Playtime 2015: Innovation happens everywhere",
@@ -3857,76 +3846,76 @@
     "summary": "Watch the opening video from Google Play's annual event series, Playtime, which celebrates inspirational developers who are changing the world around them.",
   },
   "http://www.youtube.com/watch?v=rcU7VEs1hiE": {
-    "url":"http://www.youtube.com/watch?v=rcU7VEs1hiE&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+    "url":"https://www.youtube.com/watch?v=rcU7VEs1hiE&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
     "image": "images/distribute/hero-rogervoice-story.jpg",
     "title": "RogerVoice uses beta testing to launch on Android first",
     "type" : "youtube",
     "summary": "RogerVoice helps people who are hearing impaired make phone calls through voice recognition and text captions. Hear how they used material design and beta testing to create a UI that's accessible and intuitive to navigate.",
   },
   "http://www.youtube.com/watch?v=JFlX9rW7Epc": {
-    "url":"http://www.youtube.com/watch?v=JFlX9rW7Epc&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+    "url":"https://www.youtube.com/watch?v=JFlX9rW7Epc&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
     "image": "images/distribute/hero-domain-story.jpg",
     "title": "Domain increases installs by 44% with Material Design",
     "type" : "youtube",
     "summary": "Learn how Domain, a premier real-estate portal in Australia, drastically improved their Google Play app reviews, ratings and downloads by investing in their Android app experience.",
   },
   "http://www.youtube.com/watch?v=4CqXCkcN_d4": {
-    "url":"http://www.youtube.com/watch?v=4CqXCkcN_d4&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+    "url":"https://www.youtube.com/watch?v=4CqXCkcN_d4&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
     "image": "images/distribute/hero-dots-story.jpg",
     "title": "Dots increases installs with Store Listing Experiments",
     "type" : "youtube",
     "summary": "Hear how US-founded game developer, Dots, used the Store Listing Experiments feature in the Google Play Developer Console to test what icon, graphics, and text worked the best at converting visitors to installs.",
   },
-  "http://www.youtube.com/watch?v=JrR6o5tYMWQ": {
-    "url":"http://www.youtube.com/watch?v=JrR6o5tYMWQ",
+  "https://www.youtube.com/watch?v=JrR6o5tYMWQ": {
+    "url":"https://www.youtube.com/watch?v=JrR6o5tYMWQ",
     "image": "images/distribute/hero-acquisition-devbyte.jpg",
     "title": "User acquisition and tracking on Google Play",
     "type" : "youtube",
     "summary": "Learn how to get new users, using Universal app campaigns directly within the Google Play Developer Console to increase your installs from ads, and find out how your acquisition channels perform.",
   },
-  "http://www.youtube.com/watch?v=Pd49vTkvu0U": {
-    "url":"http://www.youtube.com/watch?v=Pd49vTkvu0U&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+  "https://www.youtube.com/watch?v=Pd49vTkvu0U": {
+    "url":"https://www.youtube.com/watch?v=Pd49vTkvu0U&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
     "image": "images/distribute/hero-jelly-button.jpg",
     "title": "How Jelly Button Games are growing globally through data",
     "summary": "To really understand their users, Jelly Button Games analyzes over 3 billion events each month using Google Analytics and Google BigQuery.",
   },
-  "http://www.youtube.com/watch?v=700gYRkhkLM": {
-    "url":"http://www.youtube.com/watch?v=700gYRkhkLM&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+  "https://www.youtube.com/watch?v=700gYRkhkLM": {
+    "url":"https://www.youtube.com/watch?v=700gYRkhkLM&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
     "image": "images/distribute/hero-outfit7.jpg",
     "title": "Outfit7 — Building an entertainment company with Google",
     "summary": "Outfit7, creators of My Talking Tom and My Talking Angela, offer a complete entertainment experience to users spanning mobile apps, user generated and original YouTube content, and a range of toys, clothing, and accessories....",
   },
-  "http://www.youtube.com/watch?v=MPnH7h12h0U": {
-    "url":"http://www.youtube.com/watch?v=MPnH7h12h0U&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+  "https://www.youtube.com/watch?v=MPnH7h12h0U": {
+    "url":"https://www.youtube.com/watch?v=MPnH7h12h0U&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
     "image": "images/distribute/hero-haystack.jpg",
     "summary": "Haystack TV built a scalable business with six employees and Android TV. Two weeks was all it took for them to bring their mobile app to the big screen.",
   },
-  "http://www.youtube.com/watch?v=ekxABqJeRBc": {
-    "url":"http://www.youtube.com/watch?v=ekxABqJeRBc&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+  "https://www.youtube.com/watch?v=ekxABqJeRBc": {
+    "url":"https://www.youtube.com/watch?v=ekxABqJeRBc&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
     "image": "images/distribute/hero-ginlemon.jpg",
     "title": "How GinLemon is breaking through with Google Play",
     "summary": "Meet Vincenzo Colucci, developer and founder of GinLemon, which started as a summer holiday joke and has now become a successful global app business on Google Play based in Manfredonia, southern Italy.",
   },
-  "http://www.youtube.com/watch?v=0r36OJaeMo4": {
-    "url":"http://www.youtube.com/watch?v=0r36OJaeMo4&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+  "https://www.youtube.com/watch?v=0r36OJaeMo4": {
+    "url":"https://www.youtube.com/watch?v=0r36OJaeMo4&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
     "image": "images/distribute/hero-shifty-jelly.jpg",
     "title": "Shifty Jelly — building a number 1 podcast app",
     "summary": "Shifty Jelly is an Adelaide based mobile development company that has seen great success building Pocket Casts, a premium podcast manager app.",
   },
-  "http://www.youtube.com/watch?v=1Iw7Tg_afKk": {
+  "https://www.youtube.com/watch?v=1Iw7Tg_afKk": {
     "image": "images/distribute/hero-wooga.jpg",
-    "url":"http://www.youtube.com/watch?v=1Iw7Tg_afKk&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+    "url":"https://www.youtube.com/watch?v=1Iw7Tg_afKk&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
     "title": "Wooga’s fast iterations on Google Play",
     "summary": "The speed at which Wooga is able to iterate its live and under development games with the Android and Google Play tools has been key to delivering hits such as Diamond Dash, Jelly Splash, and Agent Alice.",
   },
-  "http://www.youtube.com/watch?v=TieksFvD-7o": {
-    "url":"http://www.youtube.com/watch?v=TieksFvD-7o&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+  "https://www.youtube.com/watch?v=TieksFvD-7o": {
+    "url":"https://www.youtube.com/watch?v=TieksFvD-7o&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
     "image": "images/distribute/hero-trello.jpg",
     "title": "Trello lifts engagement by double digits with material design",
     "summary": "Trello recently redesigned their collaborative planning app using the material design guidelines, and their efforts paid off.",
   },
-  "http://www.youtube.com/watch?v=MCoh4Pxs_ok": {
-    "url":"http://www.youtube.com/watch?v=MCoh4Pxs_ok&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+  "https://www.youtube.com/watch?v=MCoh4Pxs_ok": {
+    "url":"https://www.youtube.com/watch?v=MCoh4Pxs_ok&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
     "image": "images/distribute/hero-the-hunt.jpg",
     "title": "The Hunt — growing engagement with material design and Google Play",
     "summary": "Material design has helped The Hunt to enhance engagement in their style advice and product discovery app. ",
diff --git a/docs/html/jd_extras_en.js b/docs/html/jd_extras_en.js
new file mode 100644
index 0000000..34a779b
--- /dev/null
+++ b/docs/html/jd_extras_en.js
@@ -0,0 +1,4793 @@
+/* Metadata represendations of resources that are outside of the autogenerated
+   local resource lists, or that override local resource representations.
+
+   Resources listed here are referenced from queries and collections,
+   matched by url string.
+
+   Currently, these articles can override only the generated resources
+   in DISTRIBUTE_RESOURCES. A representation defined here will not be applied
+   when a collection or section specifies a url that's not in DISTRIBUTE_RESOURCEs.
+   Also
+   So if a section url refers to a static doc that's
+   not in a distribute section, you need to create an item for
+   it in this file. Fix is to compare across
+   ALL_RESOURCES_BY_URL.  */
+
+METADATA['en'].extras = METADATA['en'].extras.concat([
+ /* TODO Remove standard resources from here, such as below
+ */
+  {
+    "title":"Measure your app’s user acquisition channels",
+    "category":"google",
+    "summary":"Get details on how to use the Developer Console User Acquisitions reports to discover where your users come from.",
+    "url":"https://support.google.com/googleplay/android-developer/answer/6263332",
+    "group":"",
+    "keywords": [],
+    "tags": [],
+    "image":"images/cards/google-play_2x.png",
+    "type":"distribute"
+  },
+  {
+    "title":"Set up native app install banners in Chrome",
+    "category":"google",
+    "summary":"Get the details you need to add your native app or game to your site’s web app manifest file.",
+    "url":"https://developers.google.com/web/updates/2015/03/increasing-engagement-with-app-install-banners-in-chrome-for-android#native",
+    "group":"",
+    "keywords": [],
+    "tags": [],
+    "image":"images/cards/google-play_2x.png",
+    "type":"distribute"
+  },
+  {
+    "title":"Optimize your store listing pages with experiments",
+    "category":"google",
+    "summary":"You can run experiments to find the most effective graphics and localized text for your app.",
+    "url":"https://support.google.com/googleplay/android-developer/answer/6227309",
+    "group":"",
+    "keywords": [],
+    "tags": [],
+    "image":"images/cards/google-play_2x.png",
+    "type":"distribute"
+  },
+  {
+    "title":"Content Experiments for Mobile Apps",
+    "category":"google",
+    "summary":"Google Analytics Content Experiments allows you to test multiple variations of a given web page.",
+    "url":"https://support.google.com/tagmanager/answer/6003007",
+    "group":"",
+    "keywords": [],
+    "tags": [],
+    "image":"images/cards/google-play_2x.png",
+    "type":"distribute"
+  },
+  {
+    "title":"Use alpha/beta testing & staged rollouts",
+    "category":"google play",
+    "summary":"Using the Google Play Developer Console, you can choose groups of users to test different versions of your app.",
+    "url":"https://support.google.com/googleplay/android-developer/answer/3131213",
+    "group":"",
+    "keywords": [],
+    "tags": [],
+    "image":"images/cards/google-play_2x.png",
+    "type":"distribute"
+  },
+  {
+    "title":"Quizlet Developer Story",
+    "category":"google play",
+    "summary":"Quizlet is an extremely popular online learning tool for students. See how they optimized for the classroom with Android and the power of Google Play for Education.",
+    "url":"https://www.youtube.com/watch?v=Idu7VcTTXfk",
+    "group":"",
+    "keywords": [],
+    "tags": [
+      "#gpfe",
+      "#googleplay"
+    ],
+    "image":"https://i1.ytimg.com/vi/Idu7VcTTXfk/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"What's New in GPFE",
+    "category":"google play",
+    "summary":"Learn about the vision and philosophy behind Google Play for Education",
+    "url":"https://www.youtube.com/watch?v=IKhU180eJMo",
+    "group":"",
+    "keywords": [],
+    "tags": [
+      "#gpfe",
+      "#googleplay"
+    ],
+    "image":"https://i1.ytimg.com/vi/IKhU180eJMo/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Get started with Google Cast",
+    "category":"google",
+    "summary":"Build multi-screen experiences, let the user send video and audio content to TVs and speakers.",
+    "url":"https://developers.google.com/cast/docs/ux_guidelines",
+    "group":"",
+    "keywords": ["cast", "chromecast", "video", "audio"],
+    "tags": [],
+    "image":"images/cards/card-cast_2x.jpg",
+    "type":"develop"
+  },
+  {
+    "title":"Android Sender Applications",
+    "category":"google",
+    "summary":"Get an overview of how your Android app can act as a Google Cast sender app.",
+    "url":"https://developers.google.com/cast/docs/android_sender",
+    "group":"",
+    "keywords": ["cast", "sender"],
+    "tags": [],
+    "image":"images/cards/card-cast_2x.jpg",
+    "type":"develop"
+  },
+  {
+    "title":"Cast sample apps",
+    "category":"google",
+    "summary":"Get example Google Cast applications for both senders and receivers.",
+    "url":"https://www.github.com/googlecast",
+    "group":"",
+    "keywords": ["cast", "samples"],
+    "tags": [],
+    "image":"images/cards/card-cast_2x.jpg",
+    "type":"Samples"
+  },
+  {
+    "title":"Get Cardboard",
+    "category":"Google",
+    "summary":"Get your own Cardboard, today. Buy one from a manufacturer or build your own, and start developing.",
+    "url":"https://www.google.com/get/cardboard/get-cardboard/",
+    "group":"",
+    "keywords": ["carboard","vr"],
+    "tags": [],
+    "image":"images/cards/card-cardboard_2x.png",
+    "type":"develop"
+  },
+    {
+    "title":"Download the Cardboard SDK",
+    "category":"google",
+    "summary":"Grab the Cardboard libraries from GitHub and start creating VR apps in your favorite development environment.",
+    "url":"https://developers.google.com/cardboard/android/download",
+    "group":"",
+    "keywords": ["carboard","vr"],
+    "tags": [],
+    "image":"images/cards/card-cardboard_2x.png",
+    "type":"develop"
+  },
+  {
+    "title":"Cardboard design guidelines",
+    "category":"design",
+    "summary":"Focus on overall usability and avoiding common VR pitfalls while creating an immersive experience of your own.",
+    "url":"https://www.google.com/design/spec-vr",
+    "group":"",
+    "keywords": ["carboard","vr"],
+    "tags": [],
+    "image":"images/cards/card-cardboard_2x.png",
+    "type":"Design"
+  },
+  {
+    "title":"Maps",
+    "category":"google",
+    "summary":"Give users the map that more than a billion people use every month.",
+    "url":"https://developers.google.com/maps/documentation/android/",
+    "group":"",
+    "keywords": ["maps"],
+    "tags": [],
+    "image":"images/google/gps-maps.png",
+    "type":"develop"
+  },
+    {
+    "title":"Places API",
+    "category":"google",
+    "summary":"give your users contextual information about where they are, when they’re there.",
+    "url":"https://developers.google.com/places/android/",
+    "group":"",
+    "keywords": ["places","location", "context"],
+    "tags": [],
+    "image":"images/cards/card-places_2x.png",
+    "type":"develop"
+  },
+  {
+    "title":"GCM Client for Android",
+    "category":"google",
+    "summary":"Send push notifications and pubsub from your server to Android devices around the world.",
+    "url":"https://developers.google.com/cloud-messaging/android/client",
+    "group":"",
+    "keywords": ["push","gcm"],
+    "tags": [],
+    "image":"images/cards/card-google-cloud-messaging_16-9_2x.png",
+    "type":"develop"
+  },
+  {
+    "title":"Google Cloud Messaging",
+    "category":"google",
+    "summary":"Learn about GCM and the kinds of services you can offer to users through push notifications",
+    "url":"https://developers.google.com/cloud-messaging/gcm",
+    "group":"",
+    "keywords": ["push","gcm"],
+    "tags": [],
+    "image":"images/cards/card-google-cloud-messaging_16-9_2x.png",
+    "type":"develop"
+  },
+  {
+    "title":"ClassDojo Developer Story",
+    "category":"developer story",
+    "summary":"ClassDojo is a classroom tool that helps teachers improve behavior in their classrooms quickly and easily. See how they optimized for the classroom with Android and the power of Google Play for Education.",
+    "url":"https://www.youtube.com/watch?v=iokH4SAIfRw",
+    "group":"",
+    "keywords": [],
+    "tags": [
+      "#gpfe",
+      "#googleplay"
+    ],
+    "image":"https://i1.ytimg.com/vi/iokH4SAIfRw/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Plan for Success",
+    "category":"google play",
+    "summary":"5 tips from developers on creating great EDU apps.",
+    "url":"https://www.youtube.com/watch?v=Eh2adsAyTKc",
+    "group":"",
+    "keywords": [],
+    "tags": [
+      "#gpfe",
+      "#googleplay"
+    ],
+    "image":"https://i1.ytimg.com/vi/Eh2adsAyTKc/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Optimizing Apps for Education",
+    "category":"google play",
+    "summary":"Learn how to optimize your app for teachers and students.",
+    "url":"https://www.youtube.com/watch?v=_AZ6UcPz-_g",
+    "group":"",
+    "keywords": [],
+    "tags": [
+      "#gpfe",
+      "#googleplay"
+    ],
+    "image":"https://i1.ytimg.com/vi/_AZ6UcPz-_g/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Ideas and Tools for Building Innovative Education Apps",
+    "category":"google play",
+    "summary":"Are you hungry to build an awesome app for education but don't quite know where to start? Come hear about apps that teachers want, and the APIs you're going to need to build them! In particular, we'll talk about app ideas that combine APIs for Google Drive, Google Login, Android Single Task Mode and more to build transformative Educational apps that will delight educators and kids in and out of the classroom.",
+    "url":"https://www.youtube.com/watch?v=iulXz8QTD1g",
+    "group":"",
+    "keywords": [],
+    "tags": [
+      "#gpfe",
+      "#googleplay"
+    ],
+    "image":"https://i1.ytimg.com/vi/iulXz8QTD1g/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"DesignBytes: Intro To Material Design",
+    "category":"material design",
+    "summary":"These days, UI designers need to be thinking about phones, tablets, laptops, TVs, smartwatches, and beyond. In this DesignByte we talk about how Google designers have been working on making cross-platform and multi-screen design easier. We wanted to build a design system that felt at home on every screen, from the smallest watch to the largest TV.",
+    "url":"https://www.youtube.com/watch?v=p4gmvHyuZzw",
+    "group":"",
+    "keywords": [],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/p4gmvHyuZzw/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"DesignBytes: Paper and Ink: The Materials that Matter",
+    "category":"material design",
+    "summary":"Join Rich Fulcher to learn about the materials of material design. See how virtual paper and ink form the foundation of your tactile user interface and master the rules that govern their behaviour.",
+    "url":"https://www.youtube.com/watch?v=YaG_ljfzeUw",
+    "group":"",
+    "keywords": [],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/YaG_ljfzeUw/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"DesignBytes: Material Design in the Google I/O App",
+    "category":"",
+    "summary":"Roman Nurik shares details on the design process for the Google I/O 2014 app. To check out the app's source code, visit github.com/google/iosched.",
+    "url":"https://www.youtube.com/watch?v=XOcCOBe8PTc",
+    "group":"",
+    "keywords": [],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/XOcCOBe8PTc/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Toolbars for a flexible Action Bar & more",
+    "category":"",
+    "summary":"Toolbars are a flexible View you can add to your Android app which provides many of the same APIs as the system provided Action Bar, but can also do so much more such as reacting to scrolling or being integrated directly into your layouts.",
+    "url":"https://www.youtube.com/watch?v=kmUGLURRPkI",
+    "group":"",
+    "keywords": [],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/kmUGLURRPkI/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Protecting Implicit Intents with Runtime Checks",
+    "category":"",
+    "summary":"Make sure you protect your implicit intents with a simple runtime check.",
+    "url":"https://www.youtube.com/watch?v=HGElAW224dE",
+    "group":"",
+    "keywords": [],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/HGElAW224dE/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Tabs and ViewPager",
+    "category":"",
+    "summary":"Showing multiple screens or pages of content is easy with the help of ViewPager and a PagerAdapter. Combining that with tabs make for an effective top level navigation strategy for your app or for moving between content at the same level of hierarchy within your app.",
+    "url":"https://www.youtube.com/watch?v=zQekzaAgIlQ",
+    "group":"",
+    "keywords": [],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/zQekzaAgIlQ/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Battery Drain and Networking",
+    "category":"",
+    "summary":"Let’s take a moment to make something insanely clear: As far as battery is concerned, NETWORKING is the biggest, baddest, dirtiest offender there is. And optimizing performance here isn’t easy. Since the chip isn’t always awake and draining power, means you can optimize how it wakes up, sends traffic, and saves battery.",
+    "url":"https://www.youtube.com/watch?v=fEEulSk1kNY",
+    "group":"",
+    "keywords": [],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/fEEulSk1kNY/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Batching Background Work Until Later",
+    "category":"",
+    "summary":"Yes, your app is special. But when it comes to battery use, sometimes it’s better to be part of the crowd. Why not spread the battery blame around a bit? Ian Ni-Lewis shows you how ridiculously easy it is to go from battery hog to team player in this video.",
+    "url":"https://www.youtube.com/watch?v=-3ry8PxcJJA",
+    "group":"",
+    "keywords": [],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/-3ry8PxcJJA/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"The Performance Lifecycle",
+    "category":"",
+    "summary":"Performance problems surface in your application at the least-wanted times (like right before you’re about to ship your first build). But don’t freak out: There’s a simple process that you can follow to help get your performance back under control.",
+    "url":"https://www.youtube.com/watch?v=_kKTGK-Cb_4",
+    "group":"",
+    "keywords": [],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/_kKTGK-Cb_4/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Introduction to Android Studio",
+    "category":"",
+    "summary":"Learn why you should migrate your projects to Android Studio now and how it can help you be more productive as a developer. Rich layout editor, handy suggestions and fixes, new Android project view - these are just some of the things you can expect from the IDE, which is built on the successful IntelliJ IDEA.",
+    "url":"https://www.youtube.com/watch?v=K2dodTXARqc&list=PLWz5rJ2EKKc8I9gHTMh5yKkwRRGE8BjbQ",
+    "group":"",
+    "keywords": ["studio", "tools"],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/K2dodTXARqc/maxresdefault.jpg",
+    "type":"video"
+  },
+
+  {
+    "title":"Google Play Services 7.5",
+    "category":"",
+    "summary":"This update brings App Invites, topics to GCM, GCMNetworkManager, Cast Remote Display API, Smart Lock for Passwords, Maps API for Android Wear, Google Fit extensions and more.",
+    "url":"https://www.youtube.com/watch?v=M3Udfu6qidk&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
+    "group":"",
+    "keywords": ["google play services"],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/M3Udfu6qidk/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Google Play Services 7.3",
+    "category":"",
+    "summary":"This update brings the ability to connect multiple wearables simultaneously to a single phone. There are also some great new updates to Google Fit, including nutrition types, and to Location.",
+    "url":"https://www.youtube.com/watch?v=FOn64iqlphk&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
+    "group":"",
+    "keywords": ["google play services"],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/FOn64iqlphk/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Google Play Services 6.5",
+    "category":"",
+    "summary":"Google Play services 6.5 includes new features in Google Maps, Google Drive and Google Wallet as well as the recently launched Google Fit API. ",
+    "url":"https://www.youtube.com/watch?v=fvtMtfCuEpw&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
+    "group":"",
+    "keywords": ["google play services"],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/fvtMtfCuEpw/maxresdefault.jpg",
+    "type":"video"
+  },
+    {
+    "title":"Google Play Services 7.0",
+    "category":"",
+    "summary":"Google Play services 7.0 is here! we've added the Places API, made enhancements to Location and Google Fit, and you can also remote control your Android TV through the new Nearby Connections API.",
+    "url":"https://www.youtube.com/watch?v=F0Kh_RnSM0w&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
+    "group":"",
+    "keywords": ["google play services"],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/F0Kh_RnSM0w/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Running a Successful Games Business with Google",
+    "category":"",
+    "summary":"Sure, we all want to make the next great gaming masterpiece. But we also want to feed our families and/or dogs. Join Bob Meese from the Google Play team as he gives you some key pointers on how to make sure you're best taking advantage of Google Play and running a successful games business.",
+    "url":"https://www.youtube.com/watch?v=tDmnGNkTtlE",
+    "group":"",
+    "keywords": [],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/tDmnGNkTtlE/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Introduction to Android TV",
+    "category":"",
+    "summary":"Android TV brings the Android platform to the living room with rich content and entertaining app experiences. In this video, Timothy introduces the design philosophy and developer components that make building TV experiences easier than ever before.",
+    "url":"https://www.youtube.com/watch?v=6K_jxccHv5M&index=1&list=PLOU2XLYxmsILFBfx66ens76VMLMEPJAB0",
+    "group":"",
+    "keywords": ["tv"],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/6K_jxccHv5M/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Introduction to Android Auto",
+    "category":"",
+    "summary":"Android Auto brings the Android platform to the car in a way that's optimized for the driving experience. It's the same platform you already use for phones, tablets, televisions, wearables, and more. ",
+    "url":"https://www.youtube.com/watch?v=ctiaVxgclsg&list=PLWz5rJ2EKKc9BdE_PSLNIGjXXr3h_orXM",
+    "group":"",
+    "keywords": ["auto"],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/ctiaVxgclsg/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Debugging and testing in Android Studio",
+    "titleFriendly":"",
+    "summary":"This video introduces the state of unit testing support in Studio and Google’s new Android Testing Support Library for functional UI testing and running instrumented tests on a device.",
+    "url":"https://www.youtube.com/watch?v=2I6fuD20qlY",
+    "group":"",
+    "keywords": ["testing"],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/2I6fuD20qlY/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"Android Testing (Android Dev Summit 2015)",
+    "titleFriendly":"",
+    "summary":"Overview of the testing tools and frameworks provided by Google and how they can help you to iterate more quickly and maintain a more healthy codebase.",
+    "url":"https://www.youtube.com/watch?v=vdasFFfXKOY",
+    "group":"",
+    "keywords": ["testing"],
+    "tags": [
+    ],
+    "image":"https://i1.ytimg.com/vi/vdasFFfXKOY/maxresdefault.jpg",
+    "type":"video"
+  },
+  {
+    "title":"dumpsys",
+    "titleFriendly":"",
+    "summary":"A tool that runs on the device and provides information about the status of system services.",
+    "url":"https://source.android.com/devices/tech/debug/dumpsys.html",
+    "group":"",
+    "keywords": ["testing"],
+    "tags": [
+    ],
+    "image":"",
+    "type":"google"
+  },
+  {
+    "title":"Android Testing Samples",
+    "titleFriendly":"",
+    "summary":"A collection of samples demonstrating different frameworks and techniques for automated testing.",
+    "url":"https://github.com/googlesamples/android-testing",
+    "group":"",
+    "keywords": ["testing"],
+    "tags": [
+    ],
+    "image":"images/testing/testing-icon.png",
+    "type":"Samples"
+  },
+  {
+    "title":"Android Testing Templates",
+    "titleFriendly":"",
+    "summary":"A collection of Google's Android testing tools and frameworks, all integrated in a single application project.",
+    "url":"https://github.com/googlesamples/android-testing-templates",
+    "group":"",
+    "keywords": ["testing"],
+    "tags": [
+    ],
+    "image":"images/testing/testing-icon.png",
+    "type":"Samples"
+  },
+   {
+    "title":"Android Testing Support Library (GitHub)",
+    "titleFriendly":"",
+    "summary":"A resource page on GitHub for the Android Testing Support Library.",
+    "url":"https://google.github.io/android-testing-support-library",
+    "group":"",
+    "keywords": ["testing"],
+    "tags": [
+    ],
+    "image":"images/testing/testing-icon.png",
+    "type":"Samples"
+  },
+  {
+    "title":"Android Testing Codelab",
+    "titleFriendly":"",
+    "summary":"This codelab shows how to build an Android app from the ground up in Android Studio, using a Model View Presenter architecture, Unit Tests and Instrumentation Tests.",
+    "url":"https://codelabs.developers.google.com/codelabs/android-testing/index.html",
+    "group":"",
+    "keywords": ["testing"],
+    "tags": [
+    ],
+    "image":"images/testing/testing-icon.png",
+    "type":"google"
+  },
+  {
+    "title":"Developer Registration",
+    "category":"google play",
+    "summary":"Additional information about the registration process.",
+    "url":"https://support.google.com/googleplay/android-developer/answer/113468",
+    "group":"",
+    "keywords": [],
+    "tags": [],
+    "image":"images/cards/google-play_2x.png",
+    "type":"distribute"
+  },
+  {
+    "title": "Google Play Distribution and Seller Countries",
+    "category":"google play",
+    "summary": "List of countries and territories where you can distribute your apps in Google Play.",
+    "url":"https://support.google.com/googleplay/android-developer/answer/138294",
+    "group":"",
+    "keywords": [],
+    "tags": [],
+    "image":"images/cards/google-play_2x.png",
+    "type":"distribute"
+  },
+  {
+    "title":"Google Play Content Policies",
+    "category":"google play",
+    "summary":"Details on policies relating to your developer account and app distribution is governed.",
+    "url":"https://support.google.com/googleplay/android-developer/topic/3453577",
+    "group":"",
+    "keywords": [],
+    "tags": ["#developersupport"],
+    "image":"images/cards/google-play_2x.png",
+    "type":"distribute"
+  },
+  {
+    "title":"Google Play Badge Generator",
+    "category":"google play",
+    "summary":"Build badges for your app in just a few clicks, or download hi-res badge assets localized for a variety of languages.",
+    "url":"https://play.google.com/intl/en_us/badges/",
+    "group":"",
+    "keywords": [],
+    "tags": ["#developersupport"],
+    "image":"images/gp-badges-set.png",
+    "type":"distribute"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": ["#developersupport #termsandpolicies"],
+    "url": "https://support.google.com/googleplay/android-developer/answer/4407611",
+    "timestamp": 1194884220000,
+    "image": 'images/play_dev.jpg',
+    "title": "Google Play Terms and Policies",
+    "summary": "Developer terms and policies that apply when you distribute apps in Google Play.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "title":"Google Play Policy Center",
+    "category":"google play",
+    "summary":"A central resource for you to learn about Google Play policies and guidelines.",
+    "url":"https://support.google.com/googleplay/android-developer/answer/4430948",
+    "group":"",
+    "keywords": [],
+    "tags": [],
+    "image":"https://storage.googleapis.com/support-kms-prod/SNP_712EA2784949DDF085C46E3BE7B1DC618A09_4389397_en_v0",
+    "type":"distribute"
+  },
+  {
+    "title":"Developer Help Center",
+    "category":"Support",
+    "summary":"Complete details on getting started, publishing, troubleshooting, and more.",
+    "url":"https://support.google.com/googleplay/android-developer",
+    "group":"",
+    "keywords": [],
+    "tags": [],
+    "image":"images/cards/google-play_2x.png",
+    "type":"distribute"
+  },
+  {
+    "title":"Google for Education",
+    "category":"google play",
+    "summary":"Find out more about how Google can support your work with apps and tablets.",
+    "url":"https://www.google.com/edu/tablets/",
+    "group":"",
+    "keywords": [],
+    "tags": [],
+    "image":"distribute/images/gp-edu-apps-image.jpg",
+    "type":"distribute"
+  },
+  {
+    "title":"Google Play Game Services",
+    "category":"google",
+    "summary":"Make your games social with Google Play game services. Add achievements, leaderboards, real-time multiplayer, and other popular features using the Google Play game services SDK.",
+    "url":"https://developers.google.com/games/services/",
+    "group":"",
+    "keywords": ["games","play games"],
+    "tags": [],
+    "image":"images/google/gps-play_games_logo.png",
+    "type":"distribute"
+  },
+  {
+    "title":"Get Started with Analytics",
+    "category":"google",
+    "summary":"Get advanced insight into how players discover and play your games.",
+    "url":"distribute/analyze/start.html",
+    "group":"",
+    "keywords": ["analytics"],
+    "tags": [],
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "type": "distribute"
+  },
+  {
+    "title":"Monetize your apps intelligently",
+    "category":"google",
+    "summary":"Generate revenue from your free games with ads tailored to match your game's look and feel.",
+    "url":"https://www.google.com/admob/",
+    "group":"",
+    "keywords": ["AdMob"],
+    "tags": [],
+    "image":"images/cards/admob-analytics_2x.png",
+    "type": "distribute"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [
+      "versions", "blog", "googleplay"
+    ],
+    "url": "https://android-developers.blogspot.com/",
+    "timestamp": 1004884220000,
+    "image": "images/blog.jpg",
+    "title": "Android Developers Blog",
+    "summary": "Follow the latest news on Android design, development, and distribution.",
+    "keywords": [],
+    "type": "blog",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://android-developers.blogspot.com/2011/11/making-android-games-that-play-nice.html",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Making Android Apps that Play Nice",
+    "summary": "Audio lifecycle and expected audio behaviors for Android apps.",
+    "keywords": [],
+    "type": "blog",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://android-developers.blogspot.com/2010/07/multithreading-for-performance.html",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Multithreading for Performance",
+    "summary": "Ways to improve performance through multi-threading.",
+    "keywords": [],
+    "type": "blog",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://play.google.com/about/developer-content-policy.html",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Developer Program Policies",
+    "summary": "Guidelines acceptable content in Google Play. Please read and understand the policies before publishing.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/188189",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Rating your application content for Google Play",
+    "summary": "How to choose the appropriate content ratings level for your apps.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "Support"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": ["devices", "nexus", "testing"],
+    "url": "https://developers.google.com/android/nexus/images",
+    "timestamp": 1194884220000,
+    "image": "images/cards/card-download_16-9_2x.png",
+    "title": "Factory Images for Nexus Devices",
+    "summary": "System image files for Android 6.0 and other Android releases.",
+    "keywords": ["nexus, downloads"],
+    "type": "develop",
+    "category": "Tools"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://android-developers.blogspot.com/2011/10/android-market-featured-image.html",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Google Play Featured Image Guidelines",
+    "summary": "How to create attractive, effective Featured Images for your apps.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+{
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/113477",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Supporting your users",
+    "summary": "Options for supporting users.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "Support"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "guide/practices/screens_support.html#ConfigurationExamples",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Configuration examples",
+    "summary": "How to declare layouts and other resources for specific screen sizes.",
+    "keywords": [],
+    "type": "develop",
+    "category": "guide"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "training/design-navigation/multiple-sizes.html",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Planning for Multiple Touchscreen Sizes",
+    "summary": "",
+    "keywords": [],
+    "type": "develop",
+    "category": "guide"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "training/multiscreen/index.html",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Designing for Multiple Screens",
+    "summary": "Designing an intuitive, effective navigation for tablets and other devices.",
+    "keywords": [],
+    "type": "develop",
+    "category": "guide"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "guide/topics/resources/providing-resources.html",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Providing Resources",
+    "summary": "Layouts and drawable resources for specific ranges of device screens.",
+    "keywords": [],
+    "type": "develop",
+    "category": "guide"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "training/basics/supporting-devices/screens.html",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Supporting Different Screens",
+    "summary": "Optimizing the user experience for different screen sizes and densities.",
+    "keywords": [],
+    "type": "develop",
+    "category": "guide"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "guide/topics/appwidgets/index.html#MetaData",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Adding the AppWidgetProviderInfo Metadata",
+    "summary": "How to set the height and width dimensions of a widget.",
+    "keywords": [],
+    "type": "develop",
+    "category": "guide"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "guide/topics/manifest/uses-sdk-element.html#ApiLevels",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Android API Levels",
+    "summary": "Introduction to API levels and how they relate to compatibility.",
+    "keywords": [],
+    "type": "develop",
+    "category": "compatibility"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "guide/practices/screens_support.html#DeclaringScreenSizeSupport",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Declaring screen size support",
+    "summary": "How to declare support for screen sizes in your app\'s manifest.",
+    "keywords": [],
+    "type": "develop",
+    "category": "compatibility"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "guide/topics/manifest/uses-feature-element.html#testing",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Checking for hardware feature requirements",
+    "summary": "Determining an app’s hardware and software requirements.",
+    "keywords": [],
+    "type": "develop",
+    "category": "compatibility"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://play.google.com/apps/publish/",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Google Play Developer Console",
+    "summary": "The tools console for publishing your app.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "Google Play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://youtu.be/SkHHPf3EdzE",
+    "timestamp": 1194884220000,
+    "image": "https://i1.ytimg.com/vi/SkHHPf3EdzE/maxresdefault.jpg",
+    "title": "Level Up Your Android Game",
+    "summary": "Learn how to take your game to the next level on Google Play.",
+    "keywords": [],
+    "type": "video",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/+/mobile/android/share/interactive-post",
+    "timestamp": 1194884220000,
+    "image": 'images/google/gps-googleplus.png',
+    "title": "Sharing interactive posts to Google+ from your Android app",
+    "summary": "Interactive posts provide an easy and prominent way to allow users to share your site or app with their friends and invite them to take a specific action.",
+    "keywords": ["Interactive", "Google+"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://play.google.com/about/developer-distribution-agreement.html",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Developer Distribution Agreement",
+    "summary": "Terms for distributing and selling apps and in-app products in Google Play.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/113417",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Inappropriate content in comments and applications",
+    "summary": "More details on what content is appropriate.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/legal/troubleshooter/1114905",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Removing content from Google",
+    "summary": "Find how how to request the removal of content that infringes on your trademark.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://play.google.com/about/developer-distribution-agreement-addendum.html",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Google Play for Education Addendum",
+    "summary": "Review the education-specific requirements.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://android-developers.blogspot.com/2013/03/native-rtl-support-in-android-42.html",
+    "timestamp": null,
+    "image": null,
+    "title": "Native RTL Support in Android 4.2",
+    "summary": "Blog post that explains how to support RTL in your UI.",
+    "keywords": [],
+    "type": "blog",
+    "category": "Localization"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "guide/topics/resources/string-resource.html#Plurals",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Quantity Strings (Plurals)",
+    "summary": "How to work with string plurals according to rules of grammar in a given locale.",
+    "keywords": [],
+    "type": "develop",
+    "category": "Localization"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "reference/java/util/Locale.html",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Locale",
+    "summary": "Determine what CLDR data or version of the Unicode spec a particular Android platform version uses.",
+    "keywords": [],
+    "type": "develop",
+    "category": "Localization"
+  },
+    {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "guide/topics/resources/string-resource.html",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "String Resources",
+    "summary": "Explains how to use string resources in your UI.",
+    "keywords": ["localization"],
+    "type": "develop",
+    "category": "guide"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "distribute/tools/localization-checklist.html#strings",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Manage strings for localization",
+    "summary": "Guidance on having your strings translation ready.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "localization"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "distribute/googleplay/policies/index.html",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Google Play Policies and Guidelines",
+    "summary": "An overview of Google Play policies for spam, intellectual property, and ads, with examples of common problems.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play "
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/topic/2364761",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Policy and Best Practices",
+    "summary": "Help Center document describing various content policies and processes.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/wallet/instant-buy/",
+    "timestamp": 1194884220000,
+    "image": "",
+    "title": "Android Pay APIs",
+    "summary": "Developer documentation describing Instant Buy and how to support it in your apps.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/1169947",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Selling Apps in Multiple Currencies",
+    "summary": "Help Center document describing how pricing works in Google Play.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/138412",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Prices and supported currencies",
+    "summary": "Help Center document listing supported currencies for pricing your apps.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/112622",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Transaction Fees",
+    "summary": "Help Center document describing transaction fees for priced apps and in-app products.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/138000",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Specifying tax rates",
+    "summary": "Help Center document describing how to set tax rates for different countries.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "guide/topics/resources/localization.html",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Localizing with Resources",
+    "summary": "Developer guide to localizing resources in your app.",
+    "keywords": [],
+    "type": "develop",
+    "category": "localization"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/113475",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Category types",
+    "summary": "Help Center document listing available categories for apps.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/113476",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Updates",
+    "summary": "Requirements for app updates in Google Play.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/1153479",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "In-app Billing",
+    "summary": "Help Center document describing how to correctly set up In-app Billing.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [
+      "#gpfe",
+      "#googleplay"
+    ],
+    "url": "https://youtu.be/vzvpcEffvaE",
+    "timestamp": 1383243492000,
+    "image": "https://i1.ytimg.com/vi/vzvpcEffvaE/maxresdefault.jpg",
+    "title": "Introducing Tablets with Google Play for Education",
+    "summary": "Schools in Hillsborough, New Jersey were among the first to try out Nexus 7 tablets with Google Play for Education. See the difference it made for students, teachers, and administrators.",
+    "keywords": [],
+    "type": "video",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [
+      "#engagement",
+    ],
+    "url": "https://www.youtube.com/yt/dev/",
+    "timestamp": 1383243492000,
+    "image": "https://www.youtube.com/yt/dev/media/images/yt-dev-home-hero.jpg",
+    "title": "YouTube for Developers",
+    "summary": "The YouTube APIs and Tools enable you to integrate YouTube's video content and functionality into your website, app, or device.",
+    "keywords": [],
+    "type": "video",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [
+      "#engagement",
+    ],
+    "url": "https://www.google.com/analytics/mobile/",
+    "timestamp": 1383243492000,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Mobile App Analytics",
+    "summary": "Mobile App Analytics measures what matters most at all key stages: from first discovery and download to in-app purchases. ",
+    "keywords": ["analytics,user behavior"],
+    "type": "distribute",
+    "category": "google"
+  },
+
+
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [
+      "#gcm",
+    ],
+    "url": "https://www.youtube.com/watch?v=y76rjidm8cU",
+    "timestamp": 1383243492000,
+    "image": "https://1.bp.blogspot.com/-IF-1-1kA0sg/UYwTidxdi3I/AAAAAAAAAEU/ellLeQ-E1vs/s800/google-io-lockup-2.png",
+    "title": "Google Cloud Messaging at I/O 2013",
+    "summary": "Google Cloud Messaging allows your services to efficiently send data to applications on Android devices. See what's new, and learn how to use GCM to make your apps more efficient.",
+    "keywords": ["gcm"],
+    "type": "youtube",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [
+      "#gcm",
+    ],
+    "url": "https://developer.chrome.com/apps/cloudMessagingV2",
+    "timestamp": 1383243492000,
+    "image": "images/kk-chromium-icon.png",
+    "title": "Google Cloud Messaging for Chrome",
+    "summary": "Google Cloud Messaging for Chrome (GCM) is a service for signed-in Chrome users that helps developers send message data from servers to their Chrome apps and extensions.",
+    "keywords": ["gcm"],
+    "type": "distribute",
+    "category": "google"
+  },
+
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [
+      "#sdkupdates"
+    ],
+    "url": "https://android-developers.blogspot.com/2013/07/making-beautiful-android-app-icons.html",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Make Beautiful Android App Icons",
+    "summary": "Follow these in-depth launcher icon tips on the Android Developers blog.",
+    "keywords": [],
+    "type": "blog",
+    "category": ""
+  },
+     {
+    "lang": "en",
+    "group": "",
+    "tags": [
+      "#sdkupdates"
+    ],
+    "url": "https://android-developers.blogspot.com/2012/12/localize-your-promotional-graphics-on.html",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Localize Your Promotional Graphics",
+    "summary": "Learn how to capitalise on international audiences.",
+    "keywords": [],
+    "type": "blog",
+    "category": ""
+  },
+   {
+    "lang": "en",
+    "group": "",
+    "tags": [
+      "#sdkupdates"
+    ],
+    "url": "https://android-developers.blogspot.com/2013/10/making-your-app-content-more-accessible.html",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Make your App Content more Accessible with App Linking",
+    "summary": "About using search and deep linking to get more users.",
+    "keywords": [],
+    "type": "blog",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/+/mobile/android/share/interactive-post",
+    "timestamp": 1194884220000,
+    "image": 'images/google/gps-googleplus.png',
+    "title": "Sharing interactive posts to Google+ from your Android app",
+    "summary": "Interactive posts provide an easy and prominent way to allow users to share your site or app with their friends and invite them to take a specific action.",
+    "keywords": ["Interactive", "Google+"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/+/mobile/android/",
+    "timestamp": 1194884220000,
+    "image": 'images/google/gps-googleplus.png',
+    "title": "Google+ Platform",
+    "summary": "Find out about features such as interactive posts, Hangouts, accessing basic user details and their social graphs to make your app more personal.",
+    "keywords": ["Google+"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/2528691",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "How to add multiple user accounts to your Developer Console for testing and more.",
+    "summary": "",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "google/play/licensing/index.html",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Application Licensing",
+    "summary": "Information on the features of Google Play to protect your apps’ licences.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "design/style/writing.html",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Writing Style",
+    "summary": "Design guidelines for voice and style in your UI.",
+    "keywords": [],
+    "type": "design",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://en.wikipedia.org/wiki/XLIFF",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "XML Localisation Interchange File Format (XLIFF)",
+    "summary": "Background information on XLIFF.",
+    "keywords": [],
+    "type": "develop",
+    "category": "localization"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/1078870",
+    "timestamp": 1194884220000,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Graphic Assets for your Application",
+    "summary": "Details about the graphics you can add to your product listing.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/payments/answer/2741495",
+    "timestamp": null,
+    "image": null,
+    "title": "Issuing Refunds",
+    "summary": "Help Center document describing how to issue refunds.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://android-developers.blogspot.com/2013/11/bring-your-apps-into-classroom-with.html",
+    "timestamp": null,
+    "image": "distribute/images/gp-edu-apps-image.jpg",
+    "title": "Google play for education",
+    "summary": " ",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": ["localization", "pricing", "developer support"],
+    "url": "https://support.google.com/googleplay/android-developer/table/3541286",
+    "timestamp": null,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Supported locations for distributing your apps in Google Play",
+    "summary": "Countries and regions where you can distribute your app in Google Play.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": ["games", "localization", "quality"],
+    "url": "https://www.youtube.com/watch?v=SkHHPf3EdzE",
+    "timestamp": null,
+    "image": "https://developers.google.com/apps/images/io_2013/google-io-logo.png",
+    "title": "Level Up Your Android Game",
+    "summary": "Learn how to take your game to the next level in this Google I/O session.",
+    "keywords": [],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": ["support"],
+    "url": "https://support.google.com/plus/topic/2888488",
+    "timestamp": null,
+    "image": null,
+    "title": "Google+ Communities",
+    "summary": "Host a Google+ community for testers or users.",
+    "keywords": [],
+    "type": "distribute",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": ["monetize", "ads"],
+    "url": "https://www.google.com/doubleclick/publishers/small-business/index.html",
+    "timestamp": null,
+    "image": "https://www.google.com/doubleclick/publishers/small-business/images/define_ad.png",
+    "title": "DoubleClick for Publishers",
+    "summary": "A free ad management solution that helps growing publishers sell, schedule, deliver, and measure all of their digital ad inventory.",
+    "keywords": ["ads"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": ["monetize", "ads"],
+    "url": "https://support.google.com/googleplay/android-developer/topic/2985714",
+    "timestamp": null,
+    "image":"images/cards/google-play_2x.png",
+    "title": "Policy Center: Ads",
+    "summary": "Introduction to ads and system interference policies in Google Play.",
+    "keywords": ["ads"],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/analytics/answer/2611404",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Create Audience lists in Google Analytics",
+    "summary": "Find out how to use your analytics data to discover high value users and create remarketing audiences to use in AdMob.",
+    "keywords": ["ads, analytics, monetize"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://admob.blogspot.com/",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Inside Admob",
+    "summary": "Google’s official blog for news, tips, and information on the AdMob developer platform.",
+    "keywords": ["ads, analytics, monetize"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/admob/answer/3111064",
+    "timestamp": null,
+    "image": "distribute/images/advertising.jpg",
+    "title": "AdMob in-app conversion tracking",
+    "summary": "Use in-app conversion tracking to attribute revenue back to your IAP promotion campaigns and determine which ones earn you the most.",
+    "keywords": ["ads, analytics, conversions"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": ["monetize", "giftcards"],
+    "url": "https://play.google.com/about/giftcards/",
+    "timestamp": null,
+    "image": "images/gp-balance.png",
+    "title": "Google Play Gift Cards",
+    "summary": "Buy Google Play gift cards online or at a variety of retail stores.",
+    "keywords": ["gift card"],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": ["monetize", "paymentmethods"],
+    "url": "https://support.google.com/googleplay/answer/2651410",
+    "timestamp": null,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Google Play Accepted Payment Methods",
+    "summary": "Support details on the payment methods supported in Google Play.",
+    "keywords": ["gift card"],
+    "type": "distribute",
+    "category": "google play"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": ["plus", "social"],
+    "url": "https://plus.google.com/+AndroidDevelopers/",
+    "timestamp": null,
+    "image": "images/plus.jpg",
+    "title": "+Android Developers",
+    "summary": "Sharing news, ideas, and techniques for success.",
+    "keywords": ["+AndroidDevelopers"],
+    "type": "develop",
+    "category": "Social"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": ["plus", "social"],
+    "url": "https://plus.google.com/+GooglePlay",
+    "timestamp": null,
+    "image": "images/cards/google-play_2x.png",
+    "title": "+Google Play",
+    "summary": "News and discussion about Google Play, apps, and other content in Google+.",
+    "keywords": ["+GooglePlay"],
+    "type": "distribute",
+    "category": "Social"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/analytics/devguides/collection/android/",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Mobile App Analytics SDK",
+    "summary": "Measure everything about your app. Get started with the Google Analytics SDK for Android.",
+    "keywords": ["analytics, user behavior"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/edu/guidelines",
+    "timestamp": null,
+    "image": "https://developer.android.com/distribute/images/edu-guidelines.jpg",
+    "title": "Education Guidelines",
+    "summary": "These guidelines and requirements help you develop great apps for students, which offer compelling content and an intuitive user experience on Android tablets.",
+    "keywords": [],
+    "type": "",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/edu/faq",
+    "timestamp": null,
+    "image": "https://developer.android.com/distribute/images/gpfe-faq.jpg",
+    "title": "Education FAQ",
+    "summary": "Answers to common questions you might have about Google Play for Education.",
+    "keywords": [],
+    "type": "",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/edu/",
+    "timestamp": null,
+    "image": "https://developers.google.com/edu/images/home-android.png",
+    "title": "Chrome Apps in Google Play for Education",
+    "summary": "Find out more about Chrome apps in Google Play for Education.",
+    "keywords": [],
+    "type": "",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://www.google.com/edu/tablets/#tablets-family",
+    "timestamp": null,
+    "image": "https://www.google.com/edu/images/tablets/big-tablet.png",
+    "title": "Google Play for Education Tablets",
+    "summary": "Google Play for Education leverages a diverse set up tablets approved for the classroom which may help inform you how to build educational apps.",
+    "keywords": [],
+    "type": "",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_Deerhunter2014_gpgs.pdf",
+    "timestamp": null,
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_Deerhunter2014_gpgs.png",
+    "title": "Deer Hunter 2014 by Glu &mdash; Sign-in",
+    "summary": "Glu finds that Google Play Game Services helps improve the user experience which leads to increased player happiness. They also find that Play Games Services signed in users tend to play longer and have a higher lifetime value.",
+    "keywords": ["stories"],
+    "type": "Case Study Deck",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/ConcreteSoftware_PBABowling_gpgs.pdf",
+    "timestamp": null,
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/ConcreteSoftware_PBABowling_gpgs.png",
+    "title": "PBA® Bowling Challenge by Concrete Software &mdash; Quests",
+    "summary": "Concrete Software finds that Google Play Game Services' quests are a great way to create new content for users that leads to higher engagement.",
+    "keywords": ["stories"],
+    "type": "Case Study Deck",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Dragonplay_DragonplaySlots_gpgs.pdf",
+    "timestamp": null,
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Dragonplay_DragonplaySlots_gpgs.png",
+    "title": "Dragonplay Slots by Dragonplay &mdash; Sign-in",
+    "summary": "Dragonplay finds that players who sign in with Google Play Games services tend to be high quality users who were highly engaged. They also tend to be easier to convert to paying users.",
+    "keywords": ["stories"],
+    "type": "Case Study Deck",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Gameloft_Asphalt8_gpgs.pdf",
+    "timestamp": null,
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Gameloft_Asphalt8_gpgs.png",
+    "title": "Asphalt 8 by Gameloft &mdash; Friends invitations",
+    "summary": "Gameloft finds that Google Play Game Services users are more engaged than the average Android user and more likely to convert to paying players.",
+    "keywords": ["stories"],
+    "type": "Case Study Deck",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_EternityWarriors3_gpgs.pdf",
+    "timestamp": null,
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_EternityWarriors3_gpgs.png",
+    "title": "Eternity Warriors 3 by Glu &mdash; Gifting",
+    "summary": "Glu finds that Google Play Game Services gifting outperforms other implementations (including those with incentives) because of its seamless flow and consistent performance.",
+    "keywords": ["stories"],
+    "type": "Case Study Deck",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/HotheadGames_RivalsatWar_gpgs.pdf",
+    "timestamp": null,
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/HotheadGames_RivalsatWar_gpgs.jpg",
+    "title": "Rivals at War: Firefight by Hothead Games &mdash; Leaderboards",
+    "summary": "Hothead Games is planning to include Google Play Game Services features in all their games going forwards after seeing that players that signed in with Play Games Services tend to show higher retention and a higher average revenue.",
+    "keywords": ["stories"],
+    "type": "Case Study Deck",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/TMSOFT_Compulsive_gpgs.pdf",
+    "timestamp": null,
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/TMSOFT_Compulsive_gpgs.png",
+    "title": "Compulsive by TMSOFT &mdash; Cross-platform",
+    "summary": "TMSOFT finds that users who authenticate with Play Games Services on Android and iOS play Compulsive twice as much and purchase in-app products over four times as much.",
+    "keywords": ["stories"],
+    "type": "Case Study Deck",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Noodlecake_SuperStickmanGolf2_gpgs.pdf",
+    "timestamp": null,
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Noodlecake_SuperStickmanGolf2_gpgs.png",
+    "title": "Super Stickman Golf 2 by Noodlecake Studios &mdash; Multiplayer",
+    "summary": "Noodlecake Studios finds that Google Play Game Services’ multiplayer feature helps reduce attrition.",
+    "keywords": ["stories"],
+    "type": "Case Study Deck",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/TinyRebel_DoctorWhoLegacy_gpgs.pdf",
+    "timestamp": null,
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/TinyRebelGames_DrWhoLegacy_pgps.png",
+    "title": "Dr. Doctor Who: Legacy by Tiny Rebel Games &mdash; Achievements",
+    "summary": "After integrating achievements and cloud services from Google Play Game Services, Tiny Rebel Games saw a dramatic increase in daily revenues as a result of an increase in daily installs and an increase in the average revenue per install.",
+    "keywords": ["stories"],
+    "type": "Case Study Deck",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Senri_LeosFortune_gpgs.pdf",
+    "timestamp": null,
+    "image": "https://storage.googleapis.com/androiddevelopers/shareables/stories/Senri_LeosFortune_gpgs.png",
+    "title": "Leo’s Fortune by 1337 &amp; Senri &mdash; Saved games",
+    "summary": "1337 + Senri finds that Google Play Game Services is easy to integrate and provides essential game functions like cloud saved games, achievements and leaderboards which have a very large adoption rate amongst players.",
+    "keywords": ["stories"],
+    "type": "Case Study Deck",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "shareables/auto/AndroidAuto-audio-apps.pdf",
+    "timestamp": null,
+    "image": "auto/images/assets/icons/media_app_playback.png",
+    "title": "Android Auto Audio Apps UI Guidelines",
+    "summary": "Guidelines for designing audio apps that work with Auto. ",
+    "keywords": ["design", "Auto", "Automotive"],
+    "type": "Design",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "shareables/auto/AndroidAuto-messaging-apps.pdf",
+    "timestamp": null,
+    "image": "auto/images/assets/icons/messaging_app_notifications.png",
+    "title": "Android Auto Messaging Apps UI Guidelines",
+    "summary": "Guidelines for designing messaging apps that work with Auto. ",
+    "keywords": ["design", "Auto", "Automotive"],
+    "type": "Design",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "shareables/auto/AndroidAuto-custom-colors.pdf",
+    "timestamp": null,
+    "image": "auto/images/ui/gearhead_generic_UI.png",
+    "title": "Android Auto Color Customization UI Guidelines",
+    "summary": "Guidelines for color-customizing apps that work with Auto. ",
+    "keywords": ["design", "Auto", "Automotive"],
+    "type": "Design",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/analytics/solutions/mobile-implementation-guide",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Mobile Analytics Implementation Guide",
+    "summary": "Learn how you can implement additional Google Analytics features to better understand your users and their behavior.",
+    "keywords": ["analytics", "Play", "users"],
+    "type": "distribute",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://www.google.com/tagmanager/",
+    "timestamp": null,
+    "image": "https://www.google.com/tagmanager/images/gtm-hero-illustration-small.png",
+    "title": "Google Tag Manager",
+    "summary": "Google Tag Manager enables you to change configuration values in your mobile apps using the Google Tag Manager interface, without having to rebuild and resubmit application binaries to app marketplaces.",
+    "keywords": ["analytics", "tagmanager"],
+    "type": "distribute",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://analyticsacademy.withgoogle.com/course04",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Mobile App Analytics Fundamentals",
+    "summary": "This self-paced online course on mobile app measurement shows you how Google Analytics data can help you make your app more discoverable and profitable.",
+    "keywords": ["analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://github.com/googleanalytics/google-analytics-plugin-for-unity",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Analytics Plugin for Unity",
+    "summary": "If you're building games with Unity, you can now implement Analytics once and ship it on multiple platforms automatically.",
+    "keywords": ["analytics", "unity"],
+    "type": "Open Source Project",
+    "category": ""
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/analytics/devguides/collection/android/v4/enhanced-ecommerce",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "In-App Purchases & Ecommerce",
+    "summary": "If your app sells virtual or real goods, ecommerce tracking can help you understand what behaviors lead to purchases.",
+    "keywords": ["analytics, ecommerce"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/analytics/answer/1032415",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Goals",
+    "summary": "Track important actions in your app as goals and measure performance against your objectives.",
+    "keywords": ["analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/analytics/answer/2568874?ref_topic=6012392",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Active Users",
+    "summary": "The active user report displays your 1-day, 7-day, 14-day and 30-day trailing active users next to each other, to help you analyze performance over time.",
+    "keywords": ["analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/analytics/devguides/collection/android/v4/events",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Events",
+    "summary": "Events let you measure granular in-app activities and understand user journeys.",
+    "keywords": ["analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/analytics/devguides/collection/android/v4/customdimsmets",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Custom Dimensions",
+    "summary": "Custom dimensions enable the association of metadata with hits, users, and sessions in Google Analytics.",
+    "keywords": ["analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/analytics/devguides/collection/android/v4/user-id",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "User ID",
+    "summary": "The User ID feature enables Google Analytics to measure user activities that span across devices.",
+    "keywords": ["analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/analytics/devguides/collection/android/v4/display-features",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Demographic Reporting",
+    "summary": "By enabling display features, you can see just how different user segments engage and monetize.",
+    "keywords": ["analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/analytics/answer/3123906",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "User Segmentation",
+    "summary": "Segments let you compare metrics for different subsets of users to identify trends and opportunities for your apps.",
+    "keywords": ["analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/analytics/devguides/collection/android/v4/campaigns",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Campaign Tracking",
+    "summary": "Measuring campaigns in Google Analytics enables the attribution of campaigns and traffic sources to user activity within your app.",
+    "keywords": ["analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/analytics/answer/2956981",
+    "timestamp": null,
+    "image": "images/cards/google-play_2x.png",
+    "title": "Google Play Integration",
+    "summary": "By linking Analytics and the Play Developer Console, you can gain additional insights into the acquisition flow.",
+    "keywords": ["play, analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/analytics/answer/1033961",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "AdWords Integration",
+    "summary": "Link Analytics and AdWords to see the entire picture of customer behavior, from ad click or impression through your site to conversion. ",
+    "keywords": ["adwords, analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/analytics/devguides/collection/android/v4/campaigns#google-play-url-builder",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Campaign URL builder for Google Play",
+    "summary": "Easily create your URLs to track install campaigns.",
+    "keywords": ["play, analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/tagmanager/answer/6003007",
+    "timestamp": null,
+    "image": "https://www.google.com/tagmanager/images/gtm-hero-illustration-small.png",
+    "title": "In-App A/B Testing",
+    "summary": "With content experiments in Google Tag Manager you can test multiple variations of your app to find which works best.",
+    "keywords": ["tagmanager"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/analytics/answer/2785577",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Behavior Flow",
+    "summary": "The Behavior Flow report visualizes the path users traveled from one Screen or Event to the next. This report can help you discover what content keeps users engaged with your app.",
+    "keywords": ["analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/analytics/answer/1151300",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Custom Reports",
+    "summary": "Custom Reports let you create your own reports in your Google Analytics account.",
+    "keywords": ["analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/analytics/answer/2611268",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Audience Lists &amp; Remarketing",
+    "summary": "Remarketing with Google Analytics lets you deliver targeted ads to users who've already been to your site or app. You can even base those ads on the behavior those users displayed during their sessions.",
+    "keywords": ["analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/admob/answer/3508177",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "AdMob Integration",
+    "summary": "With Google Analytics in AdMob, you can view Google Analytics data for your linked apps from within your AdMob account.",
+    "keywords": ["analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/analytics/solutions/mobile-campaign-deep-link",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Deep-Linking",
+    "summary": "Google Analytics gives you a full view of how returning users are interacting with your app, for a holistic view beyond the install.",
+    "keywords": ["analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/admob/answer/3508177",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "AdMob Integration",
+    "summary": "With Google Analytics in AdMob, you can view Google Analytics data for your linked apps from within your AdMob account.",
+    "keywords": ["analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/analytics/answer/2568874",
+    "timestamp": null,
+    "image": "images/cards/analytics-mobile_2x.jpg",
+    "title": "Active User Report",
+    "summary": "Active user report displays your 1-day, 7-day, 14-day and 30-day trailing active users next to each other, to help you run benchmark analyses of their performance over time.",
+    "keywords": ["analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://www.google.com/design/spec/animation/",
+    "timestamp": null,
+    "image": "images/cards/material-animation_2x.png",
+    "title": "Animation",
+    "summary": "",
+    "keywords": [],
+    "type": "design",
+    "category": "material design"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://www.google.com/design/spec/style/",
+    "timestamp": null,
+    "image": "images/cards/material-style_2x.jpg",
+    "title": "Style",
+    "summary": "",
+    "keywords": [],
+    "type": "design",
+    "category": "material design"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://www.google.com/design/spec/layout/",
+    "timestamp": null,
+    "image": "images/cards/material-layout_2x.png",
+    "title": "Layout",
+    "summary": "",
+    "keywords": [],
+    "type": "design",
+    "category": "material design"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://www.google.com/design/spec/components/",
+    "timestamp": null,
+    "image": "images/cards/material-components_2x.jpg",
+    "title": "Components",
+    "summary": "",
+    "keywords": [],
+    "type": "design",
+    "category": "material design"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://www.google.com/design/spec/patterns/",
+    "timestamp": null,
+    "image": "images/cards/material-patterns_2x.png",
+    "title": "Patterns",
+    "summary": "",
+    "keywords": [],
+    "type": "design",
+    "category": "material design"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://www.google.com/design/spec/usability/",
+    "timestamp": null,
+    "image": "images/cards/material-usability_2x.png",
+    "title": "Usability",
+    "summary": "",
+    "keywords": [],
+    "type": "design",
+    "category": "material design"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://www.google.com/design/spec/resources/color-palettes.html",
+    "timestamp": null,
+    "image": "images/cards/material-color-palette_2x.jpg",
+    "title": "Color Palettes",
+    "summary": "",
+    "keywords": [],
+    "type": "design",
+    "category": "material design"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://www.google.com/design/spec/resources/layout-templates.html",
+    "timestamp": null,
+    "image": "images/cards/material-layout-template_2x.jpg",
+    "title": "Layout Templates",
+    "summary": "",
+    "keywords": [],
+    "type": "design",
+    "category": "material design"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://www.google.com/design/spec/resources/sticker-sheets-icons.html",
+    "timestamp": null,
+    "image": "images/cards/material-sticker-sheet_2x.jpg",
+    "title": "Sticker Sheets & Icons",
+    "summary": "",
+    "keywords": [],
+    "type": "design",
+    "category": "material design"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://www.google.com/design/spec/resources/roboto-noto-fonts.html",
+    "timestamp": null,
+    "image": "images/cards/material-typography_2x.jpg",
+    "title": "Typography: Roboto and Noto Sans fonts",
+    "summary": "",
+    "keywords": [],
+    "type": "design",
+    "category": "material design"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [
+      "icons",
+      "material",
+      "iconography"
+    ],
+    "url": "https://www.google.com/design/icons/index.html",
+    "timestamp": null,
+    "image": "images/cards/card-material-icons-16x9_2x.jpg",
+    "title": "Material icon collection",
+    "summary": "",
+    "keywords": ["icons"],
+    "type": "design",
+    "category": "material design"
+  },
+
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/adwords/answer/6032059",
+    "timestamp": null,
+    "image": "distribute/images/advertising.jpg",
+    "title": "Setting up Mobile App Install Ads",
+    "summary": "With Mobile app installs campaigns on the Search and Display Networks, and TrueView for mobile app promotion on YouTube, you can create custom app install ads that run exclusively on phones and tablets.",
+    "keywords": ["marketing", "admob"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/adwords/answer/6167164",
+    "timestamp": null,
+    "image": "distribute/images/advertising.jpg",
+    "title": "Best practices for Mobile App Engagement",
+    "summary": "Learn how to market to your user base to drive re-engagement with your app. ",
+    "keywords": ["marketing", "admob"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [
+      "marketing",
+      "engagement",
+      "adwords1"
+    ],
+    "url": "https://support.google.com/adwords/answer/6032073",
+    "timestamp": null,
+    "image": "https://www.gstatic.com/images/icons/material/product/2x/adwords_64dp.png",
+    "title": "Setting up Mobile App Engagement Ads",
+    "summary": "Mobile app engagement campaigns are a great choice for advertisers focused on connecting with people who already have their app.",
+    "keywords": [
+      "marketing",
+      "engagement",
+      "adwords"
+    ],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [
+      "marketing",
+      "engagement"
+    ],
+    "url": "https://support.google.com/adwords/answer/6167162",
+    "timestamp": null,
+    "image": "https://www.gstatic.com/images/icons/material/product/2x/adwords_64dp.png",
+    "title": "Best Practices for Mobile App Installs",
+    "summary": "Getting your mobile app discovered can be challenging. Learn how to drive downloads of your app and grow a valuable user base.",
+    "keywords": ["marketing", "adwords"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/admob/topic/2784623",
+    "timestamp": null,
+    "image": "distribute/images/advertising.jpg",
+    "title": "Set up your AdMob account",
+    "summary": "Setting up your AdMob account in the right way will help you get the most value, check out the Setup and Basics guide.",
+    "keywords": ["marketing", "admob"],
+    "type": "distribute",
+    "category": "google"
+    },
+    {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://analyticsacademy.withgoogle.com/mobile-app",
+    "timestamp": null,
+    "image": "distribute/images/advertising.jpg",
+    "title": "Analytics Academy for Mobile Apps",
+    "summary": "Learn how to use Google Analytics to make your app more discoverable and profitable.",
+    "keywords": ["marketing", "analytics"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/mobile-ads-sdk/download",
+    "timestamp": null,
+    "image": "distribute/images/advertising.jpg",
+    "title": "Admob Ads",
+    "summary": "Use the Mobile Ads SDK to start showing AdMob ads in your apps.",
+    "keywords": ["marketing", "adwords"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/admob/",
+    "timestamp": null,
+    "image": "distribute/images/advertising.jpg",
+    "title": "AdMob Help Center",
+    "summary": "For setup assistance, general info, and fixes for specific problems check out the AdMob Help Center.",
+    "keywords": ["admob"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/admob/answer/2753860",
+    "timestamp": null,
+    "image": "distribute/images/advertising.jpg",
+    "title": "AdMob Policy Guidelines",
+    "summary": "Learn about best practices for displaying AdMob ads in your apps to maximize revenue.",
+    "keywords": ["admob"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/app-invites/",
+    "timestamp": 1383243492000,
+    "image": "images/cards/google-search_2x.png",
+    "title": "Set up App Invites",
+    "summary": "Bring new users to your apps with personal recommendations, incentives, and offers.",
+    "keywords": ["invites", "appinvites", "engagement", "getusers"],
+    "type": "distribute",
+    "category": "google"
+  },
+
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/app-indexing/",
+    "timestamp": 1383243492000,
+    "image": "images/cards/google-search_2x.png",
+    "title": "Set Up App Indexing",
+    "summary": "Surface your app content in Google seaerch. Deep link direct to your apps.",
+    "keywords": ["search", "appindexing", "engagement", "getusers"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/app-indexing/webmasters/details",
+    "timestamp": null,
+    "image": "images/cards/google-search_2x.png",
+    "title": "Index your app",
+    "summary": "Index your app today by adding deep links and verifying its official web site to ensure it starts appearing in Google Search results. ",
+    "keywords": ["appindexing","search","getusers"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/identity/sign-in/android/people",
+    "timestamp": 1383243492000,
+    "image": "images/cards/google-sign-in_2x.png",
+    "title": "Get user profile details",
+    "summary": "After users sign-in with Google, you can access their age range, language, and public profile information.",
+    "keywords": ["signin", "identity", "google"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/identity/sign-in/android/",
+    "timestamp": "",
+    "image": "images/cards/google-sign-in_2x.png",
+    "title": "Google Sign-In",
+    "summary": "Discover how you can enhance user experiences on your website or in your app using information provided by their Google identity.",
+    "keywords": ["signin", "identity", "google"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/+/features/play-installs",
+    "timestamp": 1383243492000,
+    "image": "images/cards/google-sign-in_2x.png",
+    "title": "Over-the-air installs",
+    "summary": "Follow this step-by-step guide to quickly add Google Sign-in and over-the-air app installs to your website.",
+    "keywords": ["signin", "google", "installs"],
+    "type": "distribute",
+    "category": "google"
+  },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/+/features/analytics",
+    "timestamp": 1383243492000,
+    "image": 'images/google/gps-googleplus.png',
+    "title": "Google+ Insights",
+    "summary": "Measure impressions of the over-the-air install prompt, resulting installs, and success rate by day, week, and month.",
+    "keywords": ["signin", "identity"],
+    "type": "distribute",
+    "category": "google"
+  },
+
+ // Online courses
+
+ {
+    "title":"UX Design for Mobile Developers",
+    "category":"online course",
+    "summary":"Learn how to design a 5-star app.",
+    "url":"https://www.udacity.com/course/ud849",
+    "group":"",
+    "keywords": ["mobile","ux","design"],
+    "tags": ["courses, start"],
+    "image":"images/cards/courses/mobile_ux_course.jpg",
+    "lang":"en",
+    "type":"design"
+  },
+  {
+    "title":"Developing Android Apps",
+    "category":"online course",
+    "summary":"Learn Android and build an app!",
+    "url":"https://www.udacity.com/course/ud853",
+    "group":"",
+    "keywords": ["android", "start","firstapp","sdk"],
+    "tags": ["courses, start"],
+    "image":"images/cards/courses/android_fundamentals_course.jpg",
+    "lang":"en",
+    "type":"develop"
+  },
+  {
+    "title":"Android Performance",
+    "category":"online course",
+    "summary":"Optimize your apps for speed and usability.",
+    "url":"https://www.udacity.com/course/ud825",
+    "group":"",
+    "keywords": ["android, performance","battery"],
+    "tags": ["courses, performance"],
+    "image":"images/cards/courses/android_performance_course.jpg",
+    "lang":"en",
+    "type":"develop"
+  },
+  {
+    "title":"Enroll in the Android Nanodegree",
+    "category":"online course",
+    "summary":"Enroll in the Android Nanodegree to build the skills to work as an Android developer.",
+    "url":"https://www.udacity.com/android",
+    "group":"",
+    "keywords": ["android, nanodegree"],
+    "tags": ["courses"],
+    "image":"images/cards/courses/android_nanodegree.png",
+    "lang":"en",
+    "type":"develop"
+  },
+  {
+    "title":"Advanced Android App Development",
+    "category":"online course",
+    "summary":"Productionize and publish your apps.",
+    "url":"https://www.udacity.com/course/ud855",
+    "group":"",
+    "keywords": ["android, experts"],
+    "tags": ["courses, expert"],
+    "image":"images/cards/courses/advanced_android_course.jpg",
+    "lang":"en",
+    "type":"develop"
+  },
+  {
+    "title":"Material Design for Android Developers",
+    "category":"online course",
+    "summary":"Learn how to make your apps material.",
+    "url":"https://www.udacity.com/course/ud862",
+    "group":"",
+    "keywords": ["android, design, pure, material"],
+    "tags": ["courses, start, material"],
+    "image":"images/cards/courses/android_design_course.jpg",
+    "lang":"en",
+    "type":"design"
+  },
+  {
+    "title":"Android for Beginners",
+    "category":"online course",
+    "summary":"Make your first Android app, even if you don't write code.",
+    "url":"https://www.udacity.com/course/ud837",
+    "group":"",
+    "keywords": ["android, sdk, firstapp"],
+    "tags": ["courses, start"],
+    "image":"images/cards/courses/beginning_android_course.jpg",
+    "lang":"en",
+    "type":"develop"
+  },
+  {
+    "title":"Gradle for Android and Java",
+    "category":"online course",
+    "summary":"Build better apps through automation",
+    "url":"https://www.udacity.com/course/ud867",
+    "group":"",
+    "keywords": ["gradle","studio", "sdk"],
+    "tags": ["courses, gradle, sdk"],
+    "image":"images/cards/courses/gradle_course.jpg",
+    "lang":"en",
+    "type":"develop"
+  },
+  {
+    "title":"Add Location and Context to your app",
+    "category":"online course",
+    "summary":"Make Your Android App Location Aware.",
+    "url":"https://www.udacity.com/course/ud876-1",
+    "group":"",
+    "keywords": ["google services, context, location"],
+    "tags": ["courses, google, location, context"],
+    "image":"images/cards/courses/android_location_course.png",
+    "lang":"en",
+    "type":"develop"
+  },
+  {
+    "title":"Analytics and Tag Manager for Android",
+    "category":"online course",
+    "summary":"Use Analytics and Tag Manager in Your Apps.",
+    "url":"https://www.udacity.com/course/ud876-2",
+    "group":"",
+    "keywords": ["google services, analytics, tag manager"],
+    "tags": ["courses, google, analytics"],
+    "image":"images/cards/courses/android_analytics_course.png",
+    "lang":"en",
+    "type":"distribute"
+  },
+  {
+    "title":"AdMob for Android",
+    "category":"online course",
+    "summary":"Monetize Your App by Displaying Ads.",
+    "url":"https://www.udacity.com/course/ud876-3",
+    "group":"",
+    "keywords": ["monetize, google services, ads, admob"],
+    "tags": ["courses, google, ads, admob"],
+    "image":"images/cards/courses/admob_course.png",
+    "lang":"en",
+    "type":"distribute"
+  },
+  {
+    "title":"Add Maps to your Android app",
+    "category":"online course",
+    "summary":"Use maps, cameras, markers and more in your app.",
+    "url":"https://www.udacity.com/course/ud876-4",
+    "group":"",
+    "keywords": ["google, maps, marker, camera"],
+    "tags": ["courses, google, maps"],
+    "image":"images/cards/courses/android_maps_course.png",
+    "lang":"en",
+    "type":"develop"
+  },
+  {
+    "title":"Add Sign-in to your Android app",
+    "category":"online course",
+    "summary":"Build a Seamless Sign-In Experience.",
+    "url":"https://www.udacity.com/course/ud876-5",
+    "group":"",
+    "keywords": ["google services, signin, authorization"],
+    "tags": ["courses, google, auth"],
+    "image":"images/cards/courses/android_identity_course.png",
+    "lang":"en",
+    "type":"develop"
+  },
+  {
+    "title":"Android Wear Development",
+    "category":"online course",
+    "summary":"Extend your Apps to Android Smartwatches.",
+    "url":"https://www.udacity.com/course/ud875A",
+    "group":"",
+    "keywords": ["wear, wearables, smartwatch"],
+    "tags": ["courses, wear, wearable"],
+    "image":"images/cards/courses/android_wear_course.jpg",
+    "lang":"en",
+    "type":"develop"
+  },
+  {
+    "title":"Android TV and Google Cast Development",
+    "category":"online course",
+    "summary":"Extend your Apps to the Big Screen.",
+    "url":"https://www.udacity.com/course/ud875B",
+    "group":"",
+    "keywords": ["cast, living room"],
+    "tags": ["courses, cast, tv"],
+    "image":"images/cards/courses/android_tv_cast_course.jpg",
+    "lang":"en",
+    "type":"develop"
+  },
+  {
+    "title":"Android Auto Development",
+    "category":"online course",
+    "summary":"Put your apps in the driver's seat.",
+    "url":"https://www.udacity.com/course/ud875C",
+    "group":"",
+    "keywords": ["auto"],
+    "tags": ["courses, auto"],
+    "image":"images/cards/courses/android_auto_course.jpg",
+    "lang":"en",
+    "type":"develop"
+  },
+
+
+ // TODO remove this?
+  {
+    "title":"Android Wear Materials",
+    "category":"design",
+    "summary":"Drag and drop your way to beautifully designed Android Wear apps.",
+    "url":"design/downloads/index.html#Wear",
+    "group":"",
+    "keywords": ["icons","stencils","color swatches"],
+    "tags": ["icons","stencils","colorswatches"],
+    "image":"images/cards/android-wear-materials_2x.jpg",
+    "lang":"en",
+    "type":"video"
+  },
+  {
+    "title":"Watch Faces for Android Wear",
+    "category":"design",
+    "summary":"Watch faces let you customize the most prominent UI feature of Android wearables. The API is simple enough for rapid development and flexible enough to build something awesome.",
+    "url":"https://www.youtube.com/watch?v=AK38PJZmIW8&list=PLWz5rJ2EKKc-kIrPiq098QH9dOle-fLef",
+    "group":"",
+    "keywords": ["wear", "wearable", "watch face"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/AK38PJZmIW8/maxresdefault.jpg",
+    "lang":"en",
+    "type":"video"
+  },
+  {
+    "title":"Android Support Library",
+    "category":"Tools",
+    "summary":"These essential components help you build a great app that works on the huge variety of Android devices, faster.",
+    "url":"https://www.youtube.com/watch?v=3PIc-DuEU2s&list=PLWz5rJ2EKKc9e0d55YHgJFHXNZbGHEXJX",
+    "group":"",
+    "keywords": ["support", "compatibility"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/3PIc-DuEU2s/maxresdefault.jpg",
+    "lang":"en",
+    "type":"video"
+  },
+  {
+    "title":"Consistent Design with the AppCompat Support Library",
+    "category":"design",
+    "summary":"Getting a great looking app doesn't have to be hard: AppCompat, part of the Android Support Library, gives you a consistent design baseline that works on all Android 2.1 or higher devices.",
+    "url":"https://www.youtube.com/watch?v=5Be2mJzP-Uw&list=PLWz5rJ2EKKc9e0d55YHgJFHXNZbGHEXJX",
+    "group":"",
+    "keywords": ["support", "compatibility","design-code"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/5Be2mJzP-Uw/maxresdefault.jpg",
+    "lang":"en",
+    "type":"video"
+  },
+  {
+    "title":"Introducing Gradle",
+    "category":"tools",
+    "summary":"Android Studio uses an entirely new and flexible Gradle-based build system. You will be able to create multiple build variants for a single project, manage library dependencies and always be sure that your application builds correctly across different environments.",
+    "url":"https://www.youtube.com/watch?v=cD7NPxuuXYY&list=PLWz5rJ2EKKc8I9gHTMh5yKkwRRGE8BjbQ",
+    "group":"",
+    "keywords": ["tools", "studio","gradle"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/cD7NPxuuXYY/maxresdefault.jpg",
+    "lang":"en",
+    "type":"video"
+  },
+  {
+    "title":"Android Studio Layout Editor",
+    "category":"tools",
+    "summary":"Android Studio includes a rich, visual layout editor that helps developers create better user interfaces. It eliminates the need to deploy the APK on a real device with each change, making iterations faster and helping eliminate common errors earlier in the development process.",
+    "url":"https://www.youtube.com/watch?v=JLLnhwtDoHw&list=PLWz5rJ2EKKc8I9gHTMh5yKkwRRGE8BjbQ",
+    "group":"",
+    "keywords": ["tools", "studio","layout"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/JLLnhwtDoHw/maxresdefault.jpg",
+    "lang":"en",
+    "type":"video"
+  },
+  {
+    "title":"Debugging and testing in Android Studio",
+    "category":"tools",
+    "summary":"Learn about new debugger features in Android Studio 1.2: value inlining, quick access to referring objects and a Java .class decompiler, just to name a few. See some new tools and views that let you monitor the CPU and memory performance of your app from within the IDE. ",
+    "url":"https://www.youtube.com/watch?v=2I6fuD20qlY&list=PLWz5rJ2EKKc8I9gHTMh5yKkwRRGE8BjbQ",
+    "group":"",
+    "keywords": ["tools", "studio","debugging","profiling","performance"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/2I6fuD20qlY/maxresdefault.jpg",
+    "lang":"en",
+    "type":"video"
+  },
+  {
+    "title":"Scale with Google Cloud Platform",
+    "category":"google",
+    "summary":"Build, test, and deploy applications on Google's highly-scalable and reliable infrastructure for your web, mobile and backend solutions.",
+    "url":"https://cloud.google.com/docs/",
+    "group":"",
+    "keywords": [],
+    "tags": [],
+    "image":"images/cards/cloud-platform_2x.png",
+    "lang":"en",
+    "type":"distribute"
+  },
+  {
+    "title":"Opportunities & Programs",
+    "category":"Google Play",
+    "summary":"Take advantage of the many ways you can distribute your app to consumers, students, and businesses through Google Play.",
+    "url":"distribute/googleplay/index.html#opportunities",
+    "group":"",
+    "keywords": [],
+    "tags": [],
+    "image":"images/cards/program-edu_2x.jpg",
+    "lang":"en",
+    "type":"distribute"
+  },
+  {
+    "title":"Android for Work",
+    "category":"Enterprise",
+    "summary":"Learn more about how Android for Work makes your favorite phones and tablets the perfect business tools.",
+    "url":"https://www.android.com/work/",
+    "group":"",
+    "keywords": ["work", "enterprise", "emm"],
+    "tags": [],
+    "image":"images/cards/card-android-work_2x.png",
+    "lang":"en",
+    "type":"about"
+  },
+  {
+    "title":"Android for Work DevBytes",
+    "category":"Enterprise",
+    "summary":"Watch the videos in this playlist to understand more about Android for Work and get tips on developing enterprise apps.",
+    "url":"https://www.youtube.com/watch?v=jQWB_-o1kz4&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX",
+    "group":"",
+    "keywords": ["work", "enterprise", "emm"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/jQWB_-o1kz4/maxresdefault.jpg",
+    "lang":"en",
+    "type":"video"
+  },
+  {
+    "title":"App Configurations, Testing and Launchers",
+    "category":"Enterprise",
+    "summary":"With Android for Work you can make your apps remotely configurable. We also cover how to test your app in a managed environment.",
+    "url":"https://www.youtube.com/watch?v=39NkpWkaH8M&index=2&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX",
+    "group":"",
+    "keywords": ["work", "enterprise", "emm"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/39NkpWkaH8M/maxresdefault.jpg",
+    "lang":"en",
+    "type":"video"
+  },
+  {
+    "title":"Building an enterprise ready app",
+    "category":"Enterprise",
+    "summary":"A holistic view of Android for Work for developers.",
+    "url":"https://www.youtube.com/watch?v=dH41OutAMNM",
+    "group":"",
+    "keywords": ["work", "enterprise", "emm"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/dH41OutAMNM/maxresdefault.jpg",
+    "lang":"en",
+    "type":"video"
+  },
+  {
+    "title":"Android for Work: Single Use Devices",
+    "category":"Enterprise",
+    "summary":"Single-purpose computers are everywhere, and Android can meet that need.",
+    "url":"https://www.youtube.com/watch?v=j3QC6hcpy90",
+    "group":"",
+    "keywords": ["work", "enterprise", "emm"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/j3QC6hcpy90/maxresdefault.jpg",
+    "lang":"en",
+    "type":"video"
+  },
+  {
+    "title":"Discover YouTube cards",
+    "category":"google",
+    "summary":"Find out more about YouTube cards, the options available, and how to use them to get the most from your YouTube content.",
+    "url":"https://support.google.com/youtube/answer/6140493",
+    "group":"",
+    "keywords": ["youtube", "video", "users", "installs"],
+    "tags": [],
+    "image":"images/cards/card-youtube_2x.png",
+    "lang":"en",
+    "type":"distribute"
+  },
+    {
+    "title":"What is YouTube account good standing?",
+    "category":"Google",
+    "summary":"Learn what it means for an account to be in good standing from the YouTube Help Center.",
+    "url":"https://support.google.com/youtube/answer/2797387",
+    "group":"",
+    "keywords": ["youtube", "video", "users", "installs"],
+    "tags": [],
+    "image":"images/cards/card-youtube_2x.png",
+    "lang":"en",
+    "type":"distribute"
+  },
+  {
+    "title":"Developing for Android 6.0 (Marshmallow)",
+    "category":"",
+    "summary":"This video covers how to get started with the preview, important APIs to test and how to provide feedback on the preview.",
+    "url":"https://www.youtube.com/watch?v=yYU4DHLwoRk",
+    "group":"",
+    "keywords": ["Marshmallow"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/yYU4DHLwoRk/maxresdefault.jpg",
+    "lang":"en",
+    "type":"video"
+  },
+  {
+    "title":"Google I/O 2015 - What's new in Android",
+    "category":"",
+    "summary":"This session will highlight the most exciting new developer features of the Android platform.",
+    "url":"https://www.youtube.com/watch?v=ndBdf1_oOGA",
+    "group":"",
+    "keywords": ["Marshmallow"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/ndBdf1_oOGA/maxresdefault.jpg",
+    "lang":"en",
+    "type":"video"
+  },
+  {
+    "title":"Fingerprint and payments APIs",
+    "category":"",
+    "summary":"New fingerprint and payments APIs are introduced in M, to enable enhanced UX and security for online purchasing, banking, and retail payments.",
+    "url":"https://www.youtube.com/watch?v=VOn7VrTRlA4",
+    "group":"",
+    "keywords": ["Marshmallow"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/VOn7VrTRlA4/maxresdefault.jpg",
+    "lang":"en",
+    "type":"video"
+  },
+  {
+    "title":"Introduction to Voice Interaction API",
+    "category":"",
+    "summary":"This video covers how to use the Voice Interaction API to support system or custom voice actions.",
+    "url":"https://www.youtube.com/watch?v=OW1A4XFRuyc",
+    "group":"",
+    "keywords": ["Marshmallow"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/OW1A4XFRuyc/maxresdefault.jpg",
+    "lang":"en",
+    "type":"video"
+  },
+  {
+    "title":"Android Auto Backup for Apps",
+    "category":"",
+    "summary":"Android Backup is the automatic, cloud-based backup and restore of users’ apps when they set up a new device.",
+    "url":"https://www.youtube.com/watch?v=HXacyy0HSW0",
+    "group":"",
+    "keywords": ["Marshmallow"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/HXacyy0HSW0/maxresdefault.jpg",
+    "lang":"en",
+    "type":"video"
+  },
+  {
+    "title":"New APIs in M for Android for Work",
+    "category":"",
+    "summary":"Android M extends Android for Work functionality with a new set of APIs for Enterprise Mobility Management providers to offer new features and policy controls to IT Departments.",
+    "url":"https://www.youtube.com/watch?v=vcSj8ln-BlE",
+    "group":"",
+    "keywords": ["Marshmallow"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/vcSj8ln-BlE/maxresdefault.jpg",
+    "lang":"en",
+    "type":"Video"
+  },
+  {
+    "title":"Android for Work: Single Use Devices",
+    "category":"",
+    "summary":"Android M is bringing the power of Android to all kinds of workplaces.",
+    "url":"https://www.youtube.com/watch?v=j3QC6hcpy90",
+    "group":"",
+    "keywords": ["Marshmallow"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/j3QC6hcpy90/maxresdefault.jpg",
+    "lang":"en",
+    "type":"Video"
+  },
+  {
+    "title":"Runtime Permissions in Android 6.0 Marshmallow",
+    "category":"",
+    "summary":"Learn how to integrate runtime permissions into your Android app.",
+    "url":"https://www.youtube.com/watch?v=C8lUdPVSzDk",
+    "group":"",
+    "keywords": ["Marshmallow"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/C8lUdPVSzDk/maxresdefault.jpg",
+    "lang":"en",
+    "type":"Video"
+  },
+  {
+    "title":"Introduction to Doze",
+    "category":"",
+    "summary":"An overview of Doze and how to make sure that your app behaves as expected both in and out of Doze mode. ",
+    "url":"https://youtu.be/N72ksDKrX6c",
+    "group":"",
+    "keywords": ["Marshmallow"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/N72ksDKrX6c/maxresdefault.jpg",
+    "lang":"en",
+    "type":"Video"
+  },
+  {
+    "title":"The Nexus 5X, Nexus 6P and Android Marshmallow",
+    "category":"",
+    "summary":"The new Nexus 5X and Nexus 6P along with some of the most significant developer features in the latest Android release,.",
+    "url":"https://youtu.be/U9tw5ypqEN0",
+    "group":"",
+    "keywords": ["Marshmallow"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/U9tw5ypqEN0/maxresdefault.jpg",
+    "lang":"en",
+    "type":"Video"
+  },
+  {
+    "title":"Asking For Permission",
+    "category":"",
+    "summary":"Picking the right way and time to ask for a permission is critical to it being granted. ",
+    "url":"https://youtu.be/iZqDdvhTZj0",
+    "group":"",
+    "keywords": ["Marshmallow"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/iZqDdvhTZj0/maxresdefault.jpg",
+    "lang":"en",
+    "type":"Video"
+  },
+  {
+    "title":"Data Binding Library",
+    "category":"",
+    "summary":"Data Binding Library is a way to write declarative layouts and minimize the glue code necessary to bind your application logic and layouts. ",
+    "url":"https://youtu.be/5sCQjeGoE7M",
+    "group":"",
+    "keywords": ["Marshmallow"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/5sCQjeGoE7M/maxresdefault.jpg",
+    "lang":"en",
+    "type":"Video"
+  },
+  {
+    "title":"App Links",
+    "category":"",
+    "summary":"App Links is a new feature of Android Marshmallow that brings a faster way of opening website links for domains that you own.",
+    "url":"https://youtu.be/LQoohRwojmw",
+    "group":"",
+    "keywords": ["Marshmallow"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/LQoohRwojmw/maxresdefault.jpg",
+    "lang":"en",
+    "type":"Video"
+  },
+  {
+    "title":"Android M Permissions",
+    "category":"",
+    "summary":"An introduction to Android M runtime permissions in Android M from Google I/O 2015. ",
+    "url":"https://www.youtube.com/watch?v=f17qe9vZ8RM",
+    "group":"",
+    "keywords": ["Marshmallow"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/f17qe9vZ8RM/maxresdefault.jpg",
+    "lang":"en",
+    "type":"Video"
+  },
+  {
+    "url":"https://www.youtube.com/watch?v=QDM52bblwlg",
+    "image": "images/distribute/hero-family-discovery.jpg",
+    "title": "Introducing the new family discovery experience on Google Play",
+    "summary": "Help families create little moments on Google Play. Opt-in your apps now.",
+    "tags":["families","googleplay"],
+    "type":"video"
+  },
+  {
+    "url":"https://www.youtube.com/watch?v=wcjqBSei3a0&list=PLOU2XLYxmsIKLNUPiFCWVtcO7mZRZ9MmS",
+    "image": "https://i1.ytimg.com/vi/wcjqBSei3a0/maxresdefault.jpg",
+    "title": "Developers connecting the world through Google Play",
+    "summary": "The mobile ecosystem is empowering developers to make good on the dream of connecting the world through technology to improve people's lives.",
+    "tags":["io15","googleplay"],
+    "keywords":["Google I/O 2015","io"],
+    "type":"video"
+  },
+  {
+    "url":"https://www.youtube.com/watch?v=B6ydLpkhq04&list=PLOU2XLYxmsIKLNUPiFCWVtcO7mZRZ9MmS",
+    "image": "https://i1.ytimg.com/vi/B6ydLpkhq04/maxresdefault.jpg",
+    "title": "Store Listing Experiments for Google Play",
+    "summary": "Learn how to use Google Play’s new store listing optimization feature to get more installs of your app, and how to test different graphics and text to find out which options perform the best. ",
+    "tags":["io15","googleplay","store listing"],
+    "tags":["google i/o","google play","store listing"],
+    "type":"video"
+  },
+  {
+    "url":"https://www.youtube.com/watch?v=jyO3-rF4Mu0&list=PLOU2XLYxmsIKLNUPiFCWVtcO7mZRZ9MmS",
+    "image": "https://i1.ytimg.com/vi/jyO3-rF4Mu0/maxresdefault.jpg",
+    "title": "Growing games with Google",
+    "summary": "The games industry has never been more promising and full of opportunities. This talk covers how Google is helping developers across a broad range of existing and emerging platforms.",
+    "tags":["io15","android", "googleplay","games"],
+    "keywords":["Google I/O","google play","games"],
+    "type":"video"
+  },
+  {
+    "url":"https://www.youtube.com/watch?v=yJisuP94lHU",
+    "image": "images/distribute/hero-playtime-opener.jpg",
+    "title": "Playtime 2015: Innovation happens everywhere",
+    "type":"Video",
+    "tags":["googleplay"],
+    "summary": "Watch the opening video from Google Play's annual event series, Playtime, which celebrates inspirational developers who are changing the world around them.",
+  },
+  {
+    "url":"https://www.youtube.com/watch?v=JrR6o5tYMWQ",
+    "image": "images/distribute/hero-acquisition-devbyte.jpg",
+    "title": "User acquisition and tracking on Google Play",
+    "type" : "Video",
+    "tags" : "users,googleplay,googleio",
+    "summary": "Learn how to get new users, using Universal app campaigns directly within the Google Play Developer Console to increase your installs from ads, and find out how your acquisition channels perform.",
+  },
+  {
+    "url":"panel1",
+    "image": "",
+    "title": "",
+    "type" : "",
+    "tags" : "",
+    "summary": "",
+  },
+  {
+    "url":"panel2",
+    "image": "",
+    "title": "",
+    "type" : "",
+    "tags" : "",
+    "summary": "",
+  },
+  {
+    "url":"panel3",
+    "image": "",
+    "title": "",
+    "type" : "",
+    "tags" : "",
+    "summary": "",
+  },
+  {
+    "url":"panel4",
+    "image": "",
+    "title": "",
+    "type" : "",
+    "tags" : "",
+    "summary": "",
+  }
+]);
+
+/**
+ * Metadata overrides for carousels/heros.
+ */
+METADATA['en'].carousel = {
+  "panel2": {
+    "image": "images/tools/and-studio_shortcuts-included_2x.png",
+    "title": "Shortcuts included",
+    "type":"Android Studio",
+    "heroColor": "#fff",
+    "url":"",
+    "summary": "No need to start from scratch, Android Studio includes prebuilt template patterns &nbsp; from navigation drawers to view pagers and GitHub integration to help guide you along quickly.",
+  },
+  "panel4": {
+    "image": "images/tools/and-studio_feat-gradle_2x.png",
+    "title": "Evolved Android builds, with Gradle",
+    "type":"Android Studio",
+    "heroColor": "#fff",
+    "summary": "Create multiple APKs for your Android app with different features using the same project. Manage app dependencies with Maven. Build APKs from Android Studio or the command line.",
+  },
+  "panel1": {
+    "image": "images/tools/codeeditor-low.gif",
+    "title": "Fast, intelligent coding",
+    "type":"Android Studio",
+    "heroColor": "#fff",
+    "summary": "Advanced code completion, refactoring and code analysis in an environment that’s purpose-built for Android, the powerful code editor helps you be a more productive Android app developer.",
+  },
+  "panel3": {
+    "image": "images/tools/studio-hero-screens_2x.png",
+    "title": " All shapes, sizes and scenarios",
+    "type":"Android Studio",
+    "heroColor": "#fff",
+    "summary": "Create multiple APKs for your Android app with different features using the same project. Manage app dependencies with Maven. Build APKs from Android Studio or the command line.",
+  },
+  "distribute/googleplay/guide.html": {
+    "image": "images/distribute/hero-secrets-to-app-success.jpg",
+    "title": "Secrets to App Success on Google Play",
+    "summary": "Get the updated guide full of useful features, tips, and best practices that will help you grow a successful app or game business on Google Play.",
+  },
+  "about/versions/lollipop.html": {
+    "image": "images/home/hero-lollipop_2x.png",
+    "heroColor": "#263238",
+    "heroInvert": true,
+    "title": "Android 5.0 Lollipop",
+    "summary": "The Android 5.0 update adds a variety of new features for your apps, such as notifications on the lock screen, an all-new camera API, OpenGL ES 3.1, the new naterial design interface, and much more.",
+  },
+  "https://www.youtube.com/watch?v=yJisuP94lHU": {
+    "url":"https://www.youtube.com/watch?v=yJisuP94lHU&index=1&list=PLWz5rJ2EKKc_QRBk7Zkl5uGjR1He7vG-w",
+    "image": "images/distribute/hero-playtime-opener.jpg",
+    "title": "Playtime 2015: Innovation happens everywhere",
+    "type":"video",
+    "summary": "Watch the opening video from Google Play's annual event series, Playtime, which celebrates inspirational developers who are changing the world around them.",
+  },
+  "http://www.youtube.com/watch?v=rcU7VEs1hiE": {
+    "url":"https://www.youtube.com/watch?v=rcU7VEs1hiE&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+    "image": "images/distribute/hero-rogervoice-story.jpg",
+    "title": "RogerVoice uses beta testing to launch on Android first",
+    "type" : "youtube",
+    "summary": "RogerVoice helps people who are hearing impaired make phone calls through voice recognition and text captions. Hear how they used material design and beta testing to create a UI that's accessible and intuitive to navigate.",
+  },
+  "http://www.youtube.com/watch?v=JFlX9rW7Epc": {
+    "url":"https://www.youtube.com/watch?v=JFlX9rW7Epc&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+    "image": "images/distribute/hero-domain-story.jpg",
+    "title": "Domain increases installs by 44% with Material Design",
+    "type" : "youtube",
+    "summary": "Learn how Domain, a premier real-estate portal in Australia, drastically improved their Google Play app reviews, ratings and downloads by investing in their Android app experience.",
+  },
+  "http://www.youtube.com/watch?v=4CqXCkcN_d4": {
+    "url":"https://www.youtube.com/watch?v=4CqXCkcN_d4&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+    "image": "images/distribute/hero-dots-story.jpg",
+    "title": "Dots increases installs with Store Listing Experiments",
+    "type" : "youtube",
+    "summary": "Hear how US-founded game developer, Dots, used the Store Listing Experiments feature in the Google Play Developer Console to test what icon, graphics, and text worked the best at converting visitors to installs.",
+  },
+  "https://www.youtube.com/watch?v=JrR6o5tYMWQ": {
+    "url":"https://www.youtube.com/watch?v=JrR6o5tYMWQ",
+    "image": "images/distribute/hero-acquisition-devbyte.jpg",
+    "title": "User acquisition and tracking on Google Play",
+    "type" : "youtube",
+    "summary": "Learn how to get new users, using Universal app campaigns directly within the Google Play Developer Console to increase your installs from ads, and find out how your acquisition channels perform.",
+  },
+  "https://www.youtube.com/watch?v=Pd49vTkvu0U": {
+    "url":"https://www.youtube.com/watch?v=Pd49vTkvu0U&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+    "image": "images/distribute/hero-jelly-button.jpg",
+    "title": "How Jelly Button Games are growing globally through data",
+    "summary": "To really understand their users, Jelly Button Games analyzes over 3 billion events each month using Google Analytics and Google BigQuery.",
+  },
+  "https://www.youtube.com/watch?v=700gYRkhkLM": {
+    "url":"https://www.youtube.com/watch?v=700gYRkhkLM&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+    "image": "images/distribute/hero-outfit7.jpg",
+    "title": "Outfit7 — Building an entertainment company with Google",
+    "summary": "Outfit7, creators of My Talking Tom and My Talking Angela, offer a complete entertainment experience to users spanning mobile apps, user generated and original YouTube content, and a range of toys, clothing, and accessories....",
+  },
+  "https://www.youtube.com/watch?v=MPnH7h12h0U": {
+    "url":"https://www.youtube.com/watch?v=MPnH7h12h0U&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+    "image": "images/distribute/hero-haystack.jpg",
+    "summary": "Haystack TV built a scalable business with six employees and Android TV. Two weeks was all it took for them to bring their mobile app to the big screen.",
+  },
+  "https://www.youtube.com/watch?v=ekxABqJeRBc": {
+    "url":"https://www.youtube.com/watch?v=ekxABqJeRBc&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+    "image": "images/distribute/hero-ginlemon.jpg",
+    "title": "How GinLemon is breaking through with Google Play",
+    "summary": "Meet Vincenzo Colucci, developer and founder of GinLemon, which started as a summer holiday joke and has now become a successful global app business on Google Play based in Manfredonia, southern Italy.",
+  },
+  "https://www.youtube.com/watch?v=0r36OJaeMo4": {
+    "url":"https://www.youtube.com/watch?v=0r36OJaeMo4&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+    "image": "images/distribute/hero-shifty-jelly.jpg",
+    "title": "Shifty Jelly — building a number 1 podcast app",
+    "summary": "Shifty Jelly is an Adelaide based mobile development company that has seen great success building Pocket Casts, a premium podcast manager app.",
+  },
+  "https://www.youtube.com/watch?v=1Iw7Tg_afKk": {
+    "image": "images/distribute/hero-wooga.jpg",
+    "url":"https://www.youtube.com/watch?v=1Iw7Tg_afKk&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+    "title": "Wooga’s fast iterations on Google Play",
+    "summary": "The speed at which Wooga is able to iterate its live and under development games with the Android and Google Play tools has been key to delivering hits such as Diamond Dash, Jelly Splash, and Agent Alice.",
+  },
+  "https://www.youtube.com/watch?v=TieksFvD-7o": {
+    "url":"https://www.youtube.com/watch?v=TieksFvD-7o&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+    "image": "images/distribute/hero-trello.jpg",
+    "title": "Trello lifts engagement by double digits with material design",
+    "summary": "Trello recently redesigned their collaborative planning app using the material design guidelines, and their efforts paid off.",
+  },
+  "https://www.youtube.com/watch?v=MCoh4Pxs_ok": {
+    "url":"https://www.youtube.com/watch?v=MCoh4Pxs_ok&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c",
+    "image": "images/distribute/hero-the-hunt.jpg",
+    "title": "The Hunt — growing engagement with material design and Google Play",
+    "summary": "Material design has helped The Hunt to enhance engagement in their style advice and product discovery app. ",
+  },
+  "https://www.youtube.com/watch?v=QDM52bblwlg": {
+    "url":"distribute/googleplay/families/about.html",
+    "image": "images/distribute/hero-family-discovery.jpg",
+    "title": "Designed for families",
+    "summary": "Introducing the new family discovery experience in Google Play. Your apps can benefit from enhanced discoverability and maintain their existing categories, rankings, and reviews elsewhere in the store. Opt-in your apps today.",
+    "type":"distribute",
+  },
+  "https://www.youtube.com/watch?v=wcjqBSei3a0&list=PLOU2XLYxmsIKLNUPiFCWVtcO7mZRZ9MmS": {
+    "url":"https://www.youtube.com/watch?v=wcjqBSei3a0&list=PLOU2XLYxmsIKLNUPiFCWVtcO7mZRZ9MmS",
+    "image": "images/distribute/hero-IO15-google-play.jpg",
+    "title": "Connecting the world through Google Play",
+    "tags":["io15"],
+    "summary": "In this this Google I/O talk, hear how the mobile ecosystem is empowering developers to connect the world through technology and improve people's lives.",
+  },
+  "https://www.youtube.com/watch?v=B6ydLpkhq04&list=PLOU2XLYxmsIKLNUPiFCWVtcO7mZRZ9MmS": {
+    "image": "images/distribute/hero-store-listing-experience.jpg",
+    "title": "Using Google Play store listing experiments",
+    "tags":["io15"],
+    "summary": "Learn how to use Google Play store listing experiments to get more installs in this Google I/O talk. Test different graphics and text to find out which options perform the best. ",
+  },
+  "https://www.youtube.com/watch?v=jyO3-rF4Mu0&list=PLOU2XLYxmsIKLNUPiFCWVtcO7mZRZ9MmS": {
+    "image": "images/distribute/hero-IO15-growing-games.jpg",
+    "title": "Growing games with Google",
+    "tags":["io15"],
+    "summary": "The games industry has never been more promising and full of opportunities. This talk from Google I/O 2015 covers how Google is helping developers across a broad range of existing and emerging platforms.",
+  },
+};
+
+/**
+ * Static metadata collections.
+ */
+METADATA['en'].collections = {
+  "index/carousel": {
+    "title": "",
+    "resources": [
+      "about/versions/lollipop.html"
+    ]
+  },
+  "index/primary": {
+    "title": "",
+    "resources": [
+      "training/building-wearables.html",
+      "training/material/index.html",
+      "sdk/index.html"
+    ]
+  },
+  "index/secondary/carousel": {
+    "title": "",
+    "resources": [
+      "https://www.youtube.com/watch?v=yJisuP94lHU",
+      "http://www.youtube.com/watch?v=rcU7VEs1hiE",
+      "http://www.youtube.com/watch?v=JFlX9rW7Epc",
+      "http://www.youtube.com/watch?v=4CqXCkcN_d4"
+    ]
+  },
+  "index/multiscreen": {
+    "title": "",
+    "resources": [
+      "wear/index.html",
+      "tv/index.html",
+      "auto/index.html"
+    ]
+  },
+  "design/landing/latest": {
+    "title": "",
+    "resources": [
+      "https://www.youtube.com/watch?v=p4gmvHyuZzw",
+      "https://www.youtube.com/watch?v=YaG_ljfzeUw",
+      "https://www.youtube.com/watch?v=XOcCOBe8PTc"
+    ]
+  },
+  "design/landing/materialdesign": {
+    "title": "",
+    "resources": [
+      "https://www.google.com/design/spec/animation/",
+      "https://www.google.com/design/spec/style/",
+      "https://www.google.com/design/spec/layout/",
+      "https://www.google.com/design/spec/components/",
+      "https://www.google.com/design/spec/patterns/",
+      "https://www.google.com/design/spec/usability/"
+    ]
+  },
+  "design/landing/pureandroid": {
+    "title": "",
+    "resources": [
+      "design/get-started/creative-vision.html",
+      "design/material/index.html",
+      "training/material/index.html",
+      "design/patterns/pure-android.html",
+      "design/patterns/new.html",
+      "design/devices.html"
+    ]
+  },
+  "design/landing/resources": {
+    "title": "",
+    "resources": [
+      "https://www.google.com/design/spec/resources/color-palettes.html",
+      "https://www.google.com/design/spec/resources/layout-templates.html",
+      "https://www.google.com/design/spec/resources/sticker-sheets-icons.html",
+      "https://www.google.com/design/spec/resources/roboto-noto-fonts.html",
+      "https://www.google.com/design/icons/index.html",
+      "design/downloads/index.html#Wear"
+    ]
+  },
+  "develop/landing/mainlinks": {
+    "title": "",
+    "resources": [
+      "tools/studio/index.html",
+      "samples/new/index.html",
+      "tools/projects/templates.html"
+    ]
+  },
+  "develop/landing/latest": {
+    "title": "",
+    "resources": [
+      "https://android-developers.blogspot.com/2015/04/new-android-code-samples.html",
+      "https://android-developers.blogspot.com/2015/04/android-support-library-221.html",
+      "https://android-developers.blogspot.com/2015/03/a-new-reference-app-for-multi-device.html"
+    ]
+  },
+  "develop/landing/devpatterns": {
+    "title": "",
+    "resources": [
+      "https://www.youtube.com/watch?v=kmUGLURRPkI",
+      "https://www.youtube.com/watch?v=HGElAW224dE",
+      "https://www.youtube.com/watch?v=zQekzaAgIlQ"
+    ]
+  },
+  "develop/landing/performance": {
+    "title": "",
+    "resources": [
+      "https://www.youtube.com/watch?v=fEEulSk1kNY",
+      "https://www.youtube.com/watch?v=-3ry8PxcJJA",
+      "https://www.youtube.com/watch?v=_kKTGK-Cb_4"
+    ]
+  },
+  "develop/landing/buildwithgoogle": {
+    "title": "",
+    "resources": [
+    ]
+  },
+  "develop/landing/ubicomp": {
+    "title": "",
+    "resources": [
+      "https://www.youtube.com/watch?v=AK38PJZmIW8&list=PLWz5rJ2EKKc-kIrPiq098QH9dOle-fLef",
+      "https://www.youtube.com/watch?v=6K_jxccHv5M&index=1&list=PLOU2XLYxmsILFBfx66ens76VMLMEPJAB0",
+      "https://www.youtube.com/watch?v=ctiaVxgclsg&list=PLWz5rJ2EKKc9BdE_PSLNIGjXXr3h_orXM"
+    ]
+  },
+  "develop/landing/tools": {
+    "title": "",
+    "resources": [
+      "https://www.youtube.com/watch?v=K2dodTXARqc&list=PLWz5rJ2EKKc8I9gHTMh5yKkwRRGE8BjbQ",
+      "https://www.youtube.com/watch?v=3PIc-DuEU2s&list=PLWz5rJ2EKKc9e0d55YHgJFHXNZbGHEXJX",
+      "https://www.youtube.com/watch?v=cD7NPxuuXYY&list=PLWz5rJ2EKKc8I9gHTMh5yKkwRRGE8BjbQ",
+      "https://www.youtube.com/watch?v=JLLnhwtDoHw&list=PLWz5rJ2EKKc8I9gHTMh5yKkwRRGE8BjbQ",
+      "https://www.youtube.com/watch?v=2I6fuD20qlY&list=PLWz5rJ2EKKc8I9gHTMh5yKkwRRGE8BjbQ",
+      "https://www.youtube.com/watch?v=5Be2mJzP-Uw&list=PLWz5rJ2EKKc9e0d55YHgJFHXNZbGHEXJX"
+    ]
+  },
+  "google/landing/services": {
+    "title": "",
+    "resources": [
+      "https://developers.google.com/analytics/devguides/collection/android/",
+      "https://developers.google.com/maps/documentation/android/",
+      "https://developers.google.com/identity/sign-in/android/",
+      "https://developers.google.com/mobile-ads-sdk/download",
+      "https://developers.google.com/cloud-messaging/gcm",
+      "https://developers.google.com/app-indexing/"
+    ]
+  },
+  "google/landing/videos": {
+    "title": "",
+    "resources": [
+      "https://www.youtube.com/watch?v=M3Udfu6qidk&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
+      "https://www.youtube.com/watch?v=FOn64iqlphk&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
+      "https://www.youtube.com/watch?v=F0Kh_RnSM0w&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
+      "https://www.youtube.com/watch?v=fvtMtfCuEpw&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf"
+    ]
+  },
+  "google/landing/googleplay": {
+    "title": "",
+    "resources": [
+      "google/play/billing/index.html",
+      "google/play/billing/billing_subscriptions.html",
+      "google/play/developer-api.html"
+    ]
+  },
+  "develop/landing/courses": {
+    "title": "",
+    "resources": [
+      "https://www.udacity.com/course/ud849",
+      "https://www.udacity.com/course/ud853",
+      "https://www.udacity.com/course/ud825",
+      "https://www.udacity.com/android",
+      "https://www.udacity.com/course/ud855",
+      "https://www.udacity.com/course/ud875A",
+      "https://www.udacity.com/course/ud875B",
+      "https://www.udacity.com/course/ud875C",
+      "https://www.udacity.com/course/ud876--1",
+      "https://www.udacity.com/course/ud876--2",
+      "https://www.udacity.com/course/ud876--3",
+      "https://www.udacity.com/course/ud876--4",
+      "https://www.udacity.com/course/ud876--5",
+      "https://www.udacity.com/course/ud862",
+      "https://www.udacity.com/course/ud837",
+      "https://www.udacity.com/course/ud867"
+    ]
+  },
+  "distribute/landing/carousel": {
+    "title": "",
+    "resources": [
+    "distribute/googleplay/guide.html",
+    "https://www.youtube.com/watch?v=JrR6o5tYMWQ",
+    "https://www.youtube.com/watch?v=B6ydLpkhq04&list=PLOU2XLYxmsIKLNUPiFCWVtcO7mZRZ9MmS",
+    "https://www.youtube.com/watch?v=yJisuP94lHU",
+    ]
+  },
+  "distribute/landing/googleplay": {
+    "title": "",
+    "resources": [
+      "distribute/googleplay/about.html",
+      "distribute/googleplay/developer-console.html",
+      "distribute/googleplay/index.html#opportunities"
+    ]
+  },
+  "distribute/landing/more": {
+    "title": "",
+    "resources": [
+      "distribute/users/promote-with-ads.html",
+      "distribute/monetize/ads.html",
+      "distribute/analyze/index.html",
+      "distribute/engage/deep-linking.html",
+      "distribute/engage/easy-signin.html",
+      "https://cloud.google.com/docs/"
+    ]
+  },
+  "distribute/edu/videos/stories": {
+    "title": "",
+    "resources": [
+      "https://www.youtube.com/watch?v=Idu7VcTTXfk",
+      "https://www.youtube.com/watch?v=iokH4SAIfRw"
+    ]
+  },
+  "distribute/edu/videos/bestpractices": {
+    "title": "",
+    "resources": [
+      "https://www.youtube.com/watch?v=iulXz8QTD1g",
+      "https://www.youtube.com/watch?v=IKhU180eJMo",
+      "https://www.youtube.com/watch?v=_AZ6UcPz-_g",
+      "https://www.youtube.com/watch?v=Eh2adsAyTKc"
+    ]
+  },
+  "distribute/edu/videos/experience": {
+    "title": "",
+    "resources": [
+      "https://youtu.be/vzvpcEffvaE"
+    ]
+  },
+  "distribute/gp/gplanding": {
+    "resources": [
+      "distribute/googleplay/about.html",
+      "distribute/googleplay/start.html",
+      "distribute/googleplay/developer-console.html"
+    ]
+  },
+  "distribute/gp/gpfelanding": {
+    "resources": [
+      "distribute/googleplay/wear.html",
+      "distribute/googleplay/tv.html",
+      "distribute/googleplay/auto.html",
+      "distribute/googleplay/families/about.html",
+      "distribute/googleplay/work/about.html",
+      "distribute/googleplay/edu/about.html",
+      "distribute/googleplay/cast.html",
+      "distribute/googleplay/cardboard.html",
+      "distribute/googleplay/guide.html"
+    ]
+  },
+  "distribute/googleplay/gpfw": {
+    "resources": [
+      "https://www.android.com/work/",
+      "https://www.youtube.com/watch?v=jQWB_-o1kz4&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX",
+      "training/enterprise/index.html"
+    ]
+  },
+  "distribute/essentials": {
+    "resources": [
+      "distribute/essentials/quality/core.html",
+      "distribute/essentials/quality/tablets.html",
+      "distribute/essentials/quality/tv.html",
+      "distribute/essentials/quality/wear.html",
+      "distribute/essentials/quality/auto.html",
+      "https://developers.google.com/edu/guidelines"
+    ]
+  },
+  "distribute/users": {
+    "title": "",
+    "resources": [
+      "distribute/users/your-listing.html",
+      "distribute/users/promote-with-ads.html",
+      "distribute/users/appindexing.html",
+      "distribute/googleplay/index.html#opportunities",
+      "distribute/analyze/improve-roi.html",
+      "distribute/users/expand-to-new-markets.html",
+      "distribute/users/promote-with-ads.html",
+      "distribute/analyze/index.html",
+      "distribute/users/app-invites.html",
+      "distribute/users/ota-installs.html",
+      "distribute/users/youtube.html",
+      "distribute/users/house-ads.html",
+      "distribute/users/experiments.html",
+      "distribute/users/user-acquisition.html",
+      "distribute/users/banners.html",
+      "distribute/users/beta.html"
+    ]
+  },
+  "distribute/engagelanding": {
+    "resources": [
+      "distribute/engage/intents.html",
+      "distribute/engage/widgets.html",
+      "distribute/engage/notifications.html",
+      "distribute/engage/deep-linking.html",
+      "distribute/engage/ads.html",
+      "distribute/engage/game-services.html",
+      "distribute/engage/easy-signin.html",
+      "distribute/analyze/build-better-apps.html",
+      "distribute/engage/gcm.html",
+      "distribute/engage/beta.html"
+    ]
+  },
+  "distribute/monetize": {
+    "resources": [
+      "distribute/monetize/premium.html",
+      "distribute/monetize/freemium.html",
+      "distribute/monetize/subscriptions.html",
+      "distribute/monetize/ads.html",
+      "distribute/monetize/ecommerce.html",
+      "distribute/monetize/payments.html",
+      "distribute/analyze/understand-user-value.html",
+    ]
+  },
+  "distribute/analyzelanding": {
+    "resources": [
+      "distribute/analyze/start.html",
+      "distribute/analyze/measure.html",
+      "distribute/analyze/understand-user-value.html",
+      "distribute/analyze/improve-roi.html",
+      "distribute/analyze/build-better-apps.html",
+      "distribute/analyze/google-services.html"
+    ]
+  },
+  "distribute/analyzestart": {
+    "resources": [
+      "https://analyticsacademy.withgoogle.com/course04",
+      "google/play-services/index.html",
+      "https://developers.google.com/analytics/solutions/mobile-implementation-guide",
+      "https://developers.google.com/analytics/devguides/collection/android/",
+      "https://www.google.com/tagmanager/",
+      "https://github.com/googleanalytics/google-analytics-plugin-for-unity"
+    ]
+  },
+  "distribute/analyzemeasure": {
+    "resources": [
+
+      "https://developers.google.com/analytics/solutions/mobile-implementation-guide",
+      "https://developers.google.com/analytics/devguides/collection/android/v4/enhanced-ecommerce",
+      "https://support.google.com/analytics/answer/1032415",
+      "https://developers.google.com/analytics/devguides/collection/android/v4/events",
+      "https://developers.google.com/analytics/devguides/collection/android/v4/customdimsmets",
+      "https://developers.google.com/analytics/devguides/collection/android/v4/user-id"
+    ]
+  },
+  "distribute/analyzeunderstand": {
+    "resources": [
+      "https://developers.google.com/analytics/devguides/collection/android/v4/display-features",
+      "https://support.google.com/analytics/answer/3123906",
+      "https://support.google.com/analytics/answer/2568874?ref_topic=6012392",
+      "https://developers.google.com/analytics/devguides/collection/android/v4/enhanced-ecommerce",
+      "https://support.google.com/analytics/answer/1032415",
+    ]
+  },
+  "distribute/analyzeimprove": {
+    "resources": [
+
+      "https://developers.google.com/analytics/devguides/collection/android/v4/campaigns",
+      "https://support.google.com/analytics/answer/2956981",
+      "https://support.google.com/analytics/answer/1033961",
+      "https://developers.google.com/analytics/devguides/collection/android/v4/campaigns#google-play-url-builder",
+      "https://developers.google.com/analytics/solutions/mobile-campaign-deep-link"
+    ]
+  },
+  "distribute/analyzebuild": {
+    "resources": [
+      "https://support.google.com/tagmanager/answer/6003007",
+      "https://support.google.com/analytics/answer/2785577",
+      "https://support.google.com/analytics/answer/1151300"
+    ]
+  },
+  "distribute/analyzeact": {
+    "resources": [
+      "https://support.google.com/analytics/answer/2611268",
+      "https://support.google.com/analytics/answer/1033961",
+      "https://support.google.com/admob/answer/3508177",
+      "https://support.google.com/analytics/answer/2956981",
+      "https://support.google.com/tagmanager/answer/6003007"
+    ]
+  },
+  "distribute/essentials/guidelines": {
+    "title": "",
+    "resources": [
+      "distribute/essentials/quality/core.html",
+      "distribute/essentials/quality/tablets.html",
+      "distribute/essentials/quality/wear.html",
+      "distribute/essentials/quality/tv.html",
+      "distribute/essentials/quality/auto.html",
+      "https://developers.google.com/edu/guidelines"
+    ]
+  },
+  "distribute/essentials/tools": {
+    "title": "",
+    "resources": [
+      "distribute/tools/launch-checklist.html",
+      "distribute/tools/localization-checklist.html",
+      "https://support.google.com/googleplay/android-developer",
+      "distribute/tools/promote/brand.html",
+      "distribute/tools/promote/device-art.html",
+      "https://play.google.com/intl/en_us/badges/",
+      "distribute/tools/promote/linking.html",
+      "distribute/tools/open-distribution.html",
+      "about/dashboards/index.html"
+    ]
+  },
+  "distribute/tools/checklists": {
+    "title": "",
+    "resources": [
+      "distribute/tools/launch-checklist.html",
+      "distribute/tools/localization-checklist.html"
+    ]
+  },
+  "distribute/tools/promote": {
+    "resources": [
+      "distribute/tools/promote/device-art.html",
+      "https://play.google.com/intl/en_us/badges/",
+      "distribute/tools/promote/linking.html"
+    ]
+  },
+  "distribute/tools/support": {
+    "title": "Google Play",
+    "resources": [
+      "https://support.google.com/googleplay/android-developer",
+      "https://support.google.com/googleplay/android-developer/answer/4430948",
+      "support.html"
+    ]
+  },
+  "distribute/tools/news": {
+    "title": "",
+    "resources": [
+      "https://android-developers.blogspot.com/",
+      "https://plus.google.com/+AndroidDevelopers/"
+    ]
+  },
+  "distribute/tools/more": {
+    "title": "Google Play",
+    "resources": [
+      "distribute/tools/promote/brand.html",
+      "distribute/tools/open-distribution.html",
+      "about/dashboards/index.html"
+    ]
+  },
+  "distribute/googleplay": {
+    "title": "Google Play",
+    "resources": [
+      "distribute/googleplay/developer-console.html",
+      "distribute/essentials/best-practices/apps.html",
+      "distribute/tools/launch-checklist.html",
+      "distribute/essentials/best-practices/games.html",
+    ]
+  },
+  "distribute/googleplay/gettingstarted": {
+    "title": "Get Started",
+    "resources": [
+      "distribute/googleplay/developer-console.html",
+      "https://support.google.com/googleplay/android-developer/answer/113468",
+      "https://support.google.com/googleplay/android-developer/answer/138294",
+      "https://support.google.com/googleplay/android-developer"
+    ]
+  },
+  "distribute/googleplay/developerconsole/related": {
+    "title": "Developer Console",
+    "resources": [
+      "google/play/billing/index.html",
+      "https://support.google.com/googleplay/android-developer/answer/138294"
+    ]
+  },
+  "distribute/googleplay/developerconsole": {
+    "title": "Developer Console",
+    "resources": [
+      "google/play/billing/index.html",
+      "https://support.google.com/googleplay/android-developer/answer/138294"
+    ]
+  },
+  "distribute/googleplay/beta": {
+    "title": "Alpha and Beta Testing",
+    "resources": [
+      "https://support.google.com/googleplay/android-developer/answer/3131213",
+      "https://support.google.com/googleplay/android-developer/answer/3131213#games",
+      "distribute/googleplay/experiments.html"
+    ]
+  },
+  "distribute/googleplay/experiments/successes": {
+    "title": "Store Listing Experiment successes",
+    "resources": [
+    ]
+  },
+  "distribute/googleplay/experiments/related": {
+    "title": "Store Listing Experiments",
+    "resources": [
+      "https://support.google.com/googleplay/android-developer/answer/6227309",
+      "https://www.youtube.com/watch?v=B6ydLpkhq04",
+      "https://support.google.com/tagmanager/answer/6003007"
+    ]
+  },
+  "distribute/googleplay/banners/related": {
+    "title": "App Install Banners",
+    "resources": [
+      "https://developers.google.com/web/updates/2015/03/increasing-engagement-with-app-install-banners-in-chrome-for-android#native"
+    ]
+  },
+  "distribute/googleplay/useracquisition/related": {
+    "title": "User Acquisition",
+    "resources": [
+      "https://support.google.com/googleplay/android-developer/answer/6263332"
+    ]
+  },
+  "distribute/googleplay/cast": {
+    "title": "Google Cast",
+    "resources": [
+      "https://developers.google.com/cast/docs/ux_guidelines",
+      "https://developers.google.com/cast/docs/android_sender",
+      "https://www.github.com/googlecast"
+    ]
+  },
+  "distribute/googleplay/cardboard": {
+    "title": "Google Cast",
+    "resources": [
+      "https://www.google.com/get/cardboard/get-cardboard/",
+      "https://developers.google.com/cardboard/android/download",
+      "https://www.google.com/design/spec-vr"
+    ]
+  },
+  "distribute/googleplay/gpfe/highlight": {
+    "title": "About Google Play for Education",
+    "resources": [
+      "https://youtu.be/vzvpcEffvaE"
+    ]
+  },
+  "distribute/googleplay/gpfe/dev/about": {
+    "title": "About Google Play for Education / Developers",
+    "resources": [
+      "distribute/googleplay/edu/start.html",
+      "https://developers.google.com/edu/guidelines",
+      "https://developers.google.com/edu/faq",
+      "distribute/essentials/quality/tablets.html",
+      "https://developers.google.com/edu/",
+      "https://www.google.com/edu/tablets/#tablets-family"
+    ]
+  },
+  "distribute/googleplay/gpfe/dev": {
+    "title": "About Google Play for Education / Developers",
+    "resources": [
+      "distribute/googleplay/edu/about.html",
+      "https://developers.google.com/edu/guidelines",
+      "distribute/essentials/quality/tablets.html",
+      "distribute/googleplay/developer-console.html",
+      "https://play.google.com/about/developer-distribution-agreement-addendum.html",
+    ]
+  },
+  "distribute/googleplay/aboutgpfe/educators/about": {
+    "title": "About Google Play for Education / Educators",
+    "resources": [
+      "https://www.google.com/edu/tablets/",
+      "https://www.youtube.com/watch?v=haEmsMo0f3w"
+    ]
+  },
+  "distribute/googleplay/aboutgpfe/educators": {
+    "title": "About Google Play for Education / Educators",
+    "resources": [
+      "https://www.google.com/edu/tablets/",
+      "https://youtu.be/vzvpcEffvaE"
+    ]
+  },
+  "distribute/googleplay/gettingstartedgpfe/educators": {
+    "title": "About Google Play for Education / Educators",
+    "resources": [
+      "https://www.google.com/edu/tablets/",
+      "https://youtu.be/vzvpcEffvaE"
+    ]
+  },
+  "distribute/essentials/eduessentials/developers": {
+    "title": "",
+    "resources": [
+      "distribute/googleplay/developer-console.html",
+      "distribute/googleplay/edu/start.html",
+      "https://developers.google.com/edu/faq"
+    ]
+  },
+  "distribute/essentials/eduessentials/educators": {
+    "title": "",
+    "resources": [
+      "https://www.google.com/edu/tablets/",
+      "distribute/essentials/quality/tablets.html",
+    ]
+  },
+  "distribute/essentials/optimizing": {
+    "title": "Optimizing Your App",
+    "resources": [
+      "design/index.html",
+      "training/articles/perf-anr.html",
+      "https://android-developers.blogspot.com/2013/10/improved-app-insight-by-linking-google.html"
+    ]
+  },
+  "distribute/users/appinvites": {
+    "title": "",
+    "resources": [
+      "https://developers.google.com/app-invites/",
+      "https://developers.google.com/identity/sign-in/android/",
+      "https://developers.google.com/app-indexing/"
+    ]
+  },
+  "distribute/users/promotewithads": {
+    "title": "",
+    "resources": [
+      "https://support.google.com/adwords/answer/6032059",
+      "https://support.google.com/adwords/answer/6032073",
+      "https://support.google.com/adwords/answer/6167164",
+      "https://support.google.com/adwords/answer/6167162"
+    ]
+  },
+  "distribute/users/buildbuzz": {
+    "title": "",
+    "resources": [
+      "https://play.google.com/intl/en_us/badges/",
+      "distribute/tools/promote/linking.html",
+      "distribute/tools/promote/device-art.html",
+      "https://plus.google.com/+GooglePlay"
+    ]
+  },
+  "distribute/users/createagreatlisting": {
+    "title": "",
+    "resources": [
+      "https://support.google.com/googleplay/android-developer/answer/1078870",
+      "https://android-developers.blogspot.com/2011/10/android-market-featured-image.html",
+      "distribute/tools/launch-checklist.html",
+      "https://android-developers.blogspot.com/2013/07/making-beautiful-android-app-icons.html",
+      "https://android-developers.blogspot.com/2012/12/localize-your-promotional-graphics-on.html",
+      "https://android-developers.blogspot.com/2013/10/making-your-app-content-more-accessible.html"
+    ]
+  },
+  "distribute/users/appindexing": {
+    "title": "",
+    "resources": [
+      "https://developers.google.com/app-indexing/",
+      "https://developers.google.com/app-indexing/webmasters/details",
+      "distribute/engage/deep-linking.html",
+      "training/app-indexing/index.html"
+    ]
+  },
+  "distribute/users/otas": {
+    "title": "",
+    "resources": [
+      "https://developers.google.com/identity/sign-in/android/",
+      "https://developers.google.com/+/features/play-installs",
+      "https://developers.google.com/+/features/analytics"
+    ]
+  },
+  "distribute/users/houseads": {
+    "title": "",
+    "resources": [
+      "https://support.google.com/admob/topic/2784623",
+      "https://developers.google.com/mobile-ads-sdk/download",
+      "https://support.google.com/googleplay/android-developer/topic/2985714",
+      "https://analyticsacademy.withgoogle.com/mobile-app",
+      "https://support.google.com/analytics/answer/2611404",
+      "https://support.google.com/admob/answer/3111064"
+    ]
+  },
+  "distribute/users/youtube": {
+    "title": "",
+    "resources": [
+      "https://support.google.com/youtube/answer/6140493",
+      "https://support.google.com/youtube/answer/2797387"
+    ]
+  },
+  "distribute/toolsreference/bestpractices/apps": {
+    "title": "",
+    "resources": [
+      "distribute/googleplay/developer-console.html",
+      "https://android-developers.blogspot.com/"
+    ]
+  },
+  "distribute/toolsreference/bestpractices/games": {
+    "title": "",
+    "resources": [
+      "google/play-services/games.html",
+      "https://android-developers.blogspot.com/",
+      "distribute/googleplay/developer-console.html",
+      "https://www.youtube.com/watch?v=1RIz-cmTQB4"
+    ]
+  },
+  "distribute/essentials/corequalityguidelines/visualdesign": {
+    "title": "",
+    "resources": [
+      "design/index.html",
+      "design/patterns/navigation.html",
+      "design/patterns/actionbar.html",
+      "design/style/iconography.html",
+      "design/patterns/notifications.html"
+    ]
+  },
+  "distribute/essentials/corequalityguidelines/functionality": {
+    "title": "",
+    "resources": [
+      "https://android-developers.blogspot.com/2011/11/making-android-games-that-play-nice.html",
+      "guide/components/tasks-and-back-stack.html",
+      "training/basics/activity-lifecycle/recreating.html"
+    ]
+  },
+  "distribute/essentials/tvqualityguidelines/visualdesign": {
+    "title": "",
+    "resources": [
+      "design/tv/index.html",
+      "training/tv/start/index.html"
+    ]
+  },
+  "distribute/essentials/tvqualityguidelines/functionality": {
+    "title": "",
+    "resources": [
+      "training/tv/start/hardware.html",
+      "training/tv/games/index.html"
+    ]
+  },
+  "distribute/essentials/wearqualityguidelines/visualdesign": {
+    "title": "",
+    "resources": [
+      "design/wear/index.html",
+      "training/building-wearables.html",
+      "training/wearables/ui/index.html"
+    ]
+  },
+  "distribute/essentials/wearqualityguidelines/functionality": {
+    "title": "",
+    "resources": [
+      "training/wearables/notifications/index.html",
+      "training/wearables/apps/index.html",
+      "training/wearables/notifications/voice-input.html"
+    ]
+  },
+  "distribute/essentials/autoqualityguidelines/visualdesign": {
+    "title": "",
+    "resources": [
+      "training/auto/messaging/index.html",
+      "training/auto/start/index.html"
+    ]
+  },
+  "distribute/essentials/core/performance": {
+    "title": "",
+    "resources": [
+      "https://android-developers.blogspot.com/2010/12/new-gingerbread-api-strictmode.html",
+      "training/articles/perf-anr.html",
+      "https://android-developers.blogspot.com/2010/07/multithreading-for-performance.html"
+    ]
+  },
+  "distribute/essentials/core/play": {
+    "title": "",
+    "resources": [
+      "distribute/tools/launch-checklist.html",
+      "https://play.google.com/about/developer-content-policy.html",
+      "https://support.google.com/googleplay/android-developer/answer/188189",
+      "https://support.google.com/googleplay/android-developer/answer/1078870",
+      "https://android-developers.blogspot.com/2011/10/android-market-featured-image.html",
+      "https://support.google.com/googleplay/android-developer/answer/113477"
+    ]
+  },
+  "distribute/essentials/tabletguidelines/optimize": {
+    "title": "",
+    "resources": [
+      "design/style/metrics-grids.html",
+      "design/style/devices-displays.html",
+      "guide/practices/screens_support.html",
+    ]
+  },
+  "distribute/essentials/tabletguidelines/extrascreen": {
+    "title": "",
+    "resources": [
+      "design/patterns/multi-pane-layouts.html",
+      "training/design-navigation/multiple-sizes.html",
+      "training/multiscreen/index.html",
+    ]
+  },
+  "distribute/essentials/tabletguidelines/assets": {
+    "title": "",
+    "resources": [
+      "design/style/iconography.html",
+      "guide/topics/resources/providing-resources.html",
+      "guide/practices/screens_support.html",
+      "training/basics/supporting-devices/screens.html"
+    ]
+  },
+  "distribute/essentials/tabletguidelines/fonts": {
+    "title": "",
+    "resources": [
+      "design/style/metrics-grids.html",
+      "design/style/typography.html",
+      "guide/practices/screens_support.html",
+      "training/multiscreen/screendensities.html"
+    ]
+  },
+  "distribute/essentials/tabletguidelines/widgets": {
+    "title": "",
+    "resources": [
+      "guide/topics/appwidgets/index.html#MetaData",
+      "guide/topics/appwidgets/index.html",
+      "design/patterns/widgets.html"
+    ]
+  },
+  "distribute/essentials/tabletguidelines/versions": {
+    "title": "",
+    "resources": [
+      "guide/topics/manifest/uses-sdk-element.html#ApiLevels",
+      "guide/topics/manifest/uses-sdk-element.html",
+      "training/basics/supporting-devices/platforms.html"
+    ]
+  },
+  "distribute/essentials/tabletguidelines/hardware": {
+    "title": "",
+    "resources": [
+      "guide/topics/manifest/uses-feature-element.html",
+      "guide/topics/manifest/uses-feature-element.html#testing"
+    ]
+  },
+  "distribute/essentials/tabletguidelines/tabletscreens": {
+    "title": "",
+    "resources": [
+      "guide/practices/screens_support.html#DeclaringScreenSizeSupport",
+      "guide/practices/screens_support.html"
+    ]
+  },
+  "distribute/essentials/tabletguidelines/showcase": {
+    "title": "",
+    "resources": [
+      "distribute/tools/launch-checklist.html",
+      "https://play.google.com/apps/publish/",
+      "https://play.google.com/intl/en_us/badges/",
+      "distribute/tools/promote/device-art.html"
+    ]
+  },
+  "distribute/essentials/tabletguidelines/googleplay": {
+    "title": "",
+    "resources": [
+      "https://android-developers.blogspot.com/2013/10/more-visibility-for-tablet-apps-in.html",
+      "google/play/filters.html"
+    ]
+  },
+  "distribute/essentials/tabletguidelines": {
+    "title": "",
+    "resources": [
+      "distribute/essentials/quality/core.html",
+      "https://android-developers.blogspot.com/2013/10/more-visibility-for-tablet-apps-in.html",
+      "distribute/tools/launch-checklist.html",
+      "distribute/tools/promote/device-art.html"
+    ]
+  },
+  "distribute/getusers/notifications": {
+    "title": "",
+    "resources": [
+      "design/patterns/notifications.html",
+      "distribute/engage/gcm.html",
+      "https://play.google.com/about/developer-content-policy.html"
+    ]
+  },
+  "distribute/engage/analytics": {
+    "title": "",
+    "resources": [
+      "https://www.google.com/analytics/mobile/",
+      "https://android-developers.blogspot.com/2013/10/improved-app-insight-by-linking-google.html",
+      "https://developers.google.com/analytics/devguides/collection/android/"
+    ]
+  },
+  "distribute/engage/widgets": {
+    "title": "",
+    "resources": [
+      "design/patterns/widgets.html",
+      "guide/topics/appwidgets/index.html"
+    ]
+  },
+  "distribute/engage/reengage": {
+    "title": "",
+    "resources": [
+      "https://support.google.com/adwords/answer/6032073",
+      "distribute/engage/deep-linking.html",
+      "https://support.google.com/adwords/answer/6167162",
+      "distribute/users/promote-with-ads.html"
+    ]
+  },
+  "distribute/engage/appindexing": {
+    "title": "",
+    "resources": [
+      "distribute/engage/intents.html",
+      "distribute/engage/deep-linking.html",
+      "distribute/users/appindexing.html",
+      "training/app-indexing/index.html"
+    ]
+  },
+  "distribute/engage/intents": {
+    "title": "",
+    "resources": [
+      "guide/components/intents-filters.html",
+      "distribute/engage/deep-linking.html",
+      "distribute/engage/ads.html"
+    ]
+  },
+  "distribute/getusers/expandnewmarkets": {
+    "title": "",
+    "resources": [
+      "distribute/tools/localization-checklist.html",
+      "https://support.google.com/googleplay/android-developer/table/3541286",
+      "distribute/stories/localization.html",
+      "https://play.google.com/intl/en_us/badges/",
+      "distribute/tools/promote/device-art.html",
+      "https://www.youtube.com/watch?v=SkHHPf3EdzE"
+    ]
+  },
+  "distribute/engage/gcm": {
+    "title": "",
+    "resources": [
+      "https://developers.google.com/cloud-messaging/gcm",
+      "https://developers.google.com/cloud-messaging/android/client",
+    ]
+  },
+  "distribute/engage/gamesservices/related": {
+    "title": "",
+    "resources": [
+      "https://developers.google.com/games/services/",
+      "distribute/analyze/start.html",
+      "distribute/googleplay/cardboard.html",
+      "https://www.google.com/admob/"
+    ]
+  },
+  "distribute/engage/googleplaygames": {
+    "title": "",
+    "resources": [
+      "https://developers.google.com/games/services/",
+      "distribute/analyze/start.html",
+      "distribute/googleplay/cardboard.html",
+      "https://www.google.com/admob/"
+    ]
+  },
+  "distribute/engage/gplus": {
+    "title": "",
+    "resources": [
+      "distribute/users/ota-installs.html",
+      "https://developers.google.com/identity/sign-in/android/people",
+      "https://developers.google.com/+/mobile/android/"
+    ]
+  },
+  "distribute/engage/community": {
+    "title": "",
+    "resources": [
+      "distribute/users/build-community.html",
+      "distribute/engage/video.html"
+    ]
+  },
+  "distribute/engage/deeplinks": {
+    "title": "",
+    "resources": [
+      "distribute/engage/easy-signin.html",
+      "https://developers.google.com/app-indexing/",
+      "https://developers.google.com/+/mobile/android/share/interactive-post"
+    ]
+  },
+  "distribute/engage/appupdates": {
+    "title": "",
+    "resources": [
+      "distribute/essentials/optimizing-your-app.html",
+      "distribute/tools/launch-checklist.html",
+      "distribute/googleplay/developer-console.html",
+      "design/patterns/notifications.html"
+    ]
+  },
+  "distribute/engage/video/more": {
+    "title": "",
+    "resources": [
+      "https://www.youtube.com/yt/dev/",
+      "distribute/essentials/best-practices/games.html",
+      "https://www.youtube.com/watch?v=RRelFvc6Czo"
+    ]
+  },
+  "distribute/engage/community": {
+    "title": "",
+    "resources": [
+      "distribute/users/build-community.html",
+      "distribute/engage/video.html"
+    ]
+  },
+  "distribute/engage/kiwi": {
+    "title": "",
+    "resources": [
+      "https://www.youtube.com/watch?v=WWArLD6nqrk"
+    ]
+  },
+  "distribute/toolsreference/gpfefaq": {
+    "title": "",
+    "resources": [
+      "https://www.google.com/edu/tablets/",
+      "distribute/googleplay/edu/start.html",
+      "https://play.google.com/about/developer-distribution-agreement-addendum.html",
+      "distribute/essentials/quality/core.html",
+      "distribute/essentials/quality/tablets.html"
+    ]
+  },
+  "distribute/toolsreference/localizationchecklist/identifylocales": {
+    "title": "",
+    "resources": [
+      "https://support.google.com/googleplay/android-developer/answer/138294"
+    ]
+  },
+  "distribute/tools/loc/designforloc": {
+    "title": "",
+    "resources": [
+      "https://android-developers.blogspot.com/2013/03/native-rtl-support-in-android-42.html",
+      "guide/topics/resources/string-resource.html#Plurals",
+      "guide/topics/resources/string-resource.html",
+      "reference/java/util/Locale.html"
+    ]
+  },
+  "distribute/toolsreference/localizationchecklist/managestrings": {
+    "title": "",
+    "resources": [
+      "guide/topics/resources/string-resource.html",
+      "design/style/writing.html",
+      "https://en.wikipedia.org/wiki/XLIFF"
+    ]
+  },
+  "distribute/toolsreference/localizationchecklist/translatestrings": {
+    "title": "",
+    "resources": [
+      "distribute/stories/localization.html",
+    ]
+  },
+  "distribute/toolsreference/localizationchecklist/preplaunch": {
+    "title": "",
+    "resources": [
+      "https://play.google.com/intl/en_us/badges/",
+      "distribute/tools/promote/device-art.html"
+    ]
+  },
+  "distribute/toolsreference/localizationchecklist/supportlaunch": {
+    "title": "",
+    "resources": [
+      "distribute/tools/launch-checklist.html",
+    ]
+  },
+  "distribute/toolsreference/launchchecklist/understanding": {
+    "title": "",
+    "resources": [
+      "tools/publishing/publishing_overview.html",
+      "tools/publishing/preparing.html"
+    ]
+  },
+  "distribute/toolsreference/launchchecklist/policies": {
+    "title": "",
+    "resources": [
+      "https://support.google.com/googleplay/android-developer/answer/4430948",
+      "https://support.google.com/googleplay/android-developer/topic/2364761",
+      "https://support.google.com/googleplay/android-developer"
+    ]
+  },
+  "distribute/toolsreference/launchchecklist/quality": {
+    "title": "",
+    "resources": [
+      "distribute/essentials/quality/core.html",
+      "distribute/essentials/quality/tablets.html",
+      "https://developers.google.com/edu/guidelines"
+    ]
+  },
+  "distribute/toolsreference/launchchecklist/rating": {
+    "title": "",
+    "resources": [
+      "https://support.google.com/googleplay/android-developer/answer/188189",
+    ]
+  },
+  "distribute/toolsreference/launchchecklist/country": {
+    "title": "",
+    "resources": [
+      "https://support.google.com/googleplay/android-developer/answer/138294"
+    ]
+  },
+  "distribute/toolsreference/launchchecklist/size": {
+    "title": "",
+    "resources": [
+      "google/play/expansion-files.html",
+      "tools/help/proguard.html"
+    ]
+  },
+  "distribute/toolsreference/launchchecklist/platform": {
+    "title": "",
+    "resources": [
+      "guide/practices/screens_support.html",
+      "about/dashboards/index.html",
+      "guide/topics/manifest/uses-sdk-element.html"
+    ]
+  },
+  "distribute/toolsreference/launchchecklist/price": {
+    "title": "",
+    "resources": [
+      "https://support.google.com/googleplay/android-developer/table/3541286",
+    ]
+  },
+  "distribute/toolsreference/launchchecklist/purchasemethod": {
+    "title": "",
+    "resources": [
+      "google/play/billing/index.html",
+      "google/play/billing/billing_subscriptions.html"
+    ]
+  },
+  "distribute/toolsreference/launchchecklist/setprice": {
+    "title": "",
+    "resources": [
+      "https://support.google.com/googleplay/android-developer/answer/1169947",
+      "https://support.google.com/googleplay/android-developer/answer/138412",
+      "https://support.google.com/googleplay/android-developer/answer/112622",
+      "https://support.google.com/googleplay/android-developer/answer/138000"
+    ]
+  },
+  "distribute/toolsreference/launchchecklist/localization": {
+    "title": "",
+    "resources": [
+      "distribute/tools/localization-checklist.html",
+      "guide/topics/resources/localization.html",
+    ]
+  },
+  "distribute/toolsreference/launchchecklist/graphics": {
+    "title": "",
+    "resources": [
+      "https://support.google.com/googleplay/android-developer/answer/1078870",
+      "https://android-developers.blogspot.com/2011/10/android-market-featured-image.html"
+    ]
+  },
+  "distribute/toolsreference/launchchecklist/productdetails": {
+    "title": "",
+    "resources": [
+      "https://support.google.com/googleplay/android-developer/answer/113475",
+      "https://support.google.com/googleplay/android-developer/answer/1078870"
+    ]
+  },
+  "distribute/toolsreference/launchchecklist/badges": {
+    "title": "",
+    "resources": [
+      "https://play.google.com/intl/en_us/badges/",
+      "distribute/tools/promote/linking.html"
+    ]
+  },
+  "distribute/toolsreference/launchchecklist/finalchecks": {
+    "title": "",
+    "resources": [
+      "https://play.google.com/about/developer-content-policy.html",
+      "https://support.google.com/googleplay/android-developer/answer/113476",
+      "support.html"
+    ]
+  },
+  "distribute/toolsreference/launchchecklist/afterlaunch": {
+    "title": "",
+    "resources": [
+      "https://support.google.com/googleplay/android-developer/answer/113477",
+      "https://support.google.com/googleplay/android-developer/answer/1153479",
+      "https://support.google.com/payments/answer/2741495",
+      "distribute/essentials/optimizing-your-app.html"
+    ]
+  },
+  "distribute/monetize/premium": {
+    "title": "",
+    "resources": [
+      "google/play/billing/index.html",
+      "https://support.google.com/googleplay/android-developer/answer/4407611"
+    ]
+  },
+  "distribute/monetize/freemium": {
+    "title": "",
+    "resources": [
+      "google/play/billing/index.html",
+      "https://support.google.com/googleplay/android-developer/answer/4407611"
+    ]
+  },
+  "distribute/monetize/subscriptions": {
+    "title": "",
+    "resources": [
+      "google/play/billing/billing_subscriptions.html",
+      "https://support.google.com/googleplay/android-developer/answer/4407611"
+    ]
+  },
+  "distribute/monetize/ecommerce": {
+    "title": "",
+    "resources": [
+      "https://developers.google.com/wallet/instant-buy/",
+      "https://support.google.com/googleplay/android-developer/answer/4407611"
+    ]
+  },
+  "distribute/monetize/advertising": {
+    "title": "",
+    "resources": [
+      "https://www.google.com/ads/admob/#subid=us-en-et-dac",
+      "https://www.google.com/doubleclick/publishers/small-business/index.html",
+      "https://support.google.com/googleplay/android-developer/topic/2985714",
+      "training/monetization/ads-and-ux.html"
+    ]
+  },
+  "distribute/monetize/admob": {
+    "title": "",
+    "resources": [
+      "https://support.google.com/admob/topic/2784623",
+      "https://admob.blogspot.com/",
+      "https://analyticsacademy.withgoogle.com/mobile-app",
+    ]
+  },
+  "distribute/monetize/paymentmethods": {
+    "title": "",
+    "resources": [
+      "https://play.google.com/about/giftcards/",
+      "https://support.google.com/googleplay/answer/2651410"
+    ]
+  },
+  "autolanding": {
+    "title": "",
+    "resources": [
+      "auto/index.html",
+      "design/auto/index.html",
+      "training/auto/index.html"
+    ]
+  },
+  "tvlanding": {
+    "title": "",
+    "resources": [
+      "tv/index.html",
+      "design/tv/index.html",
+      "training/tv/index.html"
+    ]
+  },
+  "wearlanding": {
+    "title": "",
+    "resources": [
+      "design/wear/index.html",
+      "training/building-wearables.html",
+      "training/wearables/ui/index.html"
+    ]
+  },
+  "design/auto/auto_ui_guidelines": {
+    "title": "",
+    "resources": [
+      "shareables/auto/AndroidAuto-audio-apps.pdf",
+      "shareables/auto/AndroidAuto-messaging-apps.pdf",
+      "shareables/auto/AndroidAuto-custom-colors.pdf"
+    ]
+  },
+  "training/auto/overview": {
+    "title": "",
+    "resources": [
+      "training/auto/start/index.html",
+      "design/auto/index.html",
+      "shareables/auto/AndroidAuto-custom-colors.pdf"
+    ]
+  },
+  "training/auto/messaging": {
+    "title": "",
+    "resources": [
+      "training/auto/messaging/index.html",
+      "shareables/auto/AndroidAuto-messaging-apps.pdf",
+      "samples/MessagingService/index.html"
+    ]
+  },
+  "training/auto/media": {
+    "title": "",
+    "resources": [
+      "training/auto/audio/index.html",
+      "shareables/auto/AndroidAuto-audio-apps.pdf",
+      "samples/MediaBrowserService/index.html"
+    ]
+  },
+  "training/auto/distribute": {
+    "title": "",
+    "resources": [
+      "distribute/essentials/quality/auto.html",
+      "distribute/googleplay/auto.html"
+    ]
+  },
+  "distribute/stories/games": {
+    "title": "",
+    "resources": [
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_Deerhunter2014_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/ConcreteSoftware_PBABowling_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Dragonplay_DragonplaySlots_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Gameloft_Asphalt8_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_EternityWarriors3_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/HotheadGames_RivalsatWar_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/TMSOFT_Compulsive_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Noodlecake_SuperStickmanGolf2_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/TinyRebel_DoctorWhoLegacy_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Senri_LeosFortune_gpgs.pdf"
+    ]
+  },
+  "training/testing/overview": {
+    "title": "",
+    "resources": [
+      "training/testing/start/index.html",
+      "tools/testing/testing_android.html",
+      "https://www.youtube.com/watch?v=vdasFFfXKOY"
+    ]
+  },
+  "training/testing/tools": {
+    "title": "",
+    "resources": [
+      "tools/testing-support-library/index.html",
+      "tools/help/monkey.html",
+      "tools/help/monkeyrunner_concepts.html",
+      "tools/testing/testing_otheride.html",
+      "https://source.android.com/devices/tech/debug/dumpsys.html"
+    ]
+  },
+  "training/testing/techniques": {
+    "title": "",
+    "resources": [
+      "training/testing/ui-testing/index.html",
+      "training/testing/unit-testing/index.html",
+      "training/testing/performance.html"
+    ]
+  },
+  "training/testing/resources": {
+    "title": "",
+    "resources": [
+      "https://github.com/googlesamples/android-testing",
+      "https://www.youtube.com/watch?v=2I6fuD20qlY",
+      "https://codelabs.developers.google.com/codelabs/android-testing/index.html",
+      "https://github.com/googlesamples/android-testing-templates",
+      "https://google.github.io/android-testing-support-library"
+    ]
+  },
+  "overview/1": {
+    "title": "",
+    "resources": [
+      "distribute/essentials/quality/core.html",
+      "distribute/essentials/quality/tablets.html",
+      "distribute/tools/launch-checklist.html",
+      "tools/publishing/publishing_overview.html",
+      "distribute/tools/localization-checklist.html"
+    ]
+  },
+  "overview/2": {
+    "title": "",
+    "resources": [
+      "google/play/billing/index.html",
+      "google/play/billing/api.html",
+      "google/play/billing/billing_admin.html",
+      "google/play/billing/billing_testing.html",
+      "google/play/billing/billing_best_practices.html"
+    ]
+  },
+  "overview/3": {
+    "title": "",
+    "resources": [
+      "https://play.google.com/intl/en_us/badges/",
+      "distribute/tools/promote/device-art.html",
+      "distribute/tools/promote/linking.html",
+      "distribute/tools/promote/brand.html",
+      "tools/help/proguard.html"
+    ]
+  },
+  "overview/4": {
+    "title": "",
+    "resources": [
+      "design/style/writing.html",
+      "training/basics/fragments/fragment-ui.html",
+      "training/multiscreen/index.html",
+      "training/monitoring-device-state/index.html"
+    ]
+  },
+  "training/work/apps": {
+    "title": "",
+    "resources": [
+      "training/enterprise/app-compatibility.html",
+      "training/enterprise/app-restrictions.html",
+      "https://www.youtube.com/watch?v=39NkpWkaH8M&index=2&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX",
+      "samples/AppRestrictionSchema/index.html",
+      "samples/AppRestrictionEnforcer/index.html",
+      "https://www.youtube.com/watch?v=dH41OutAMNM"
+    ]
+  },
+  "training/work/admin": {
+    "title": "",
+    "resources": [
+      "training/enterprise/work-policy-ctrl.html",
+      "samples/BasicManagedProfile/index.html",
+      "https://www.youtube.com/watch?v=j3QC6hcpy90"
+    ]
+  },
+  "tools/performance/rendering": {
+    "title": "",
+    "resources": [
+      "tools/performance/debug-gpu-overdraw/index.html",
+      "tools/performance/profile-gpu-rendering/index.html",
+      "tools/performance/hierarchy-viewer/setup.html",
+      "tools/performance/hierarchy-viewer/index.html",
+      "tools/performance/hierarchy-viewer/profiling.html"
+    ]
+  },
+  "tools/performance/memory": {
+    "title": "",
+    "resources": [
+      "tools/performance/memory-monitor/index.html",
+      "tools/performance/heap-viewer/index.html",
+      "tools/performance/allocation-tracker/index.html",
+      "tools/performance/comparison.html"
+    ]
+  },
+  "tools/performance/cpu": {
+    "title": "",
+    "resources": [
+      "tools/performance/traceview/index.html",
+      "tools/performance/systrace/index.html"
+    ]
+  },
+  "tools/performance/battery": {
+    "title": "",
+    "resources": [
+      "tools/performance/batterystats-battery-historian/index.html",
+      "tools/performance/batterystats-battery-historian/charts.html"
+    ]
+  },
+  "marshmallow/landing/resources": {
+    "title": "",
+    "resources": [
+      "about/versions/marshmallow/android-6.0-changes.html",
+      "about/versions/marshmallow/android-6.0.html",
+      "about/versions/marshmallow/samples.html"
+    ]
+  },
+  "marshmallow/landing/videos": {
+    "title": "",
+    "resources": [
+      "https://youtu.be/U9tw5ypqEN0",
+      "https://youtu.be/N72ksDKrX6c",
+      "https://youtu.be/iZqDdvhTZj0",
+      "https://www.youtube.com/watch?v=vcSj8ln-BlE",
+      "https://youtu.be/LQoohRwojmw",
+      "https://www.youtube.com/watch?v=VOn7VrTRlA4",
+      "https://youtu.be/5sCQjeGoE7M",
+      "https://www.youtube.com/watch?v=C8lUdPVSzDk",
+      "https://www.youtube.com/watch?v=HXacyy0HSW0",
+      "https://www.youtube.com/watch?v=OW1A4XFRuyc",
+      "https://www.youtube.com/watch?v=j3QC6hcpy90",
+      "https://www.youtube.com/watch?v=f17qe9vZ8RM",
+      "https://www.youtube.com/watch?v=ndBdf1_oOGA"
+    ]
+  },
+  "marshmallow/landing/more": {
+    "title": "",
+    "resources": [
+      "training/permissions/requesting.html",
+      "training/backup/autosyncapi.html",
+      "training/monitoring-device-state/doze-standby.html",
+      "training/app-links/index.html",
+      "training/articles/assistant.html",
+      "training/testing/performance.html",
+      "https://developers.google.com/android/nexus/images"
+    ]
+  },
+  "tools/landing/carousel": {
+    "title": "",
+    "resources": [
+    "panel1",
+    "panel2",
+    "panel3",
+    "panel4",
+    ]
+  },
+  "tools/landing/resources": {
+    "title": "",
+    "resources": [
+    "tools/studio/index.html",
+    "tools/studio/studio-features.html",
+    "sdk/installing/studio-tips.html",
+    ]
+  },
+};
+
+/**
+ * Static search results.
+ */
+METADATA['en'].searchHeroCollections = {
+  "material": {
+    "title":"Material Design for Android",
+    "category":"",
+    "summary":"Material design is a comprehensive guide for visual, motion, and interaction design across platforms and devices. Android now includes support for material design apps.",
+    "url":"design/material/index.html",
+    "group":"",
+    "keywords": ["material","design"],
+    "tags": ["material","design"],
+    "image":"images/cards/design-material-for-android_2x.jpg",
+    "lang":"en",
+    "type":"design"
+  }
+};
diff --git a/docs/html/jd_extras_es.js b/docs/html/jd_extras_es.js
new file mode 100644
index 0000000..7ced2595
--- /dev/null
+++ b/docs/html/jd_extras_es.js
@@ -0,0 +1,13 @@
+
+//must use intl/nn to override translated resources
+METADATA['es'].carousel = {
+  "intl/es/distribute/googleplay/guide.html": {
+    "image": "images/distribute/hero-secrets-to-app-success.jpg",
+  },
+};
+
+/**
+ * Static metadata collections for this language.
+ */
+METADATA['es'].collections = {
+};
\ No newline at end of file
diff --git a/docs/html/jd_extras_ja.js b/docs/html/jd_extras_ja.js
new file mode 100644
index 0000000..390c23c
--- /dev/null
+++ b/docs/html/jd_extras_ja.js
@@ -0,0 +1,185 @@
+/* Metadata represendations of resources that are outside of the autogenerated
+   local resource lists, or that override local resource representations.
+
+   Resources listed here are referenced from sitemap sections and collections,
+   matched by url string if there is no resource existing in ALL_RESOURCES.
+
+   Currently, these articles can override only the generated resources
+   in DISTRIBUTE_RESOURCES. A representation defined here will not be applied
+   when a collection or section specifies a url that's not in DISTRIBUTE_RESOURCEs.
+   Also
+   So if a section url refers to a static doc that's
+   not in a distribute section, you need to create an item for
+   it in this file. Fix is to compare across
+   ALL_RESOURCES_BY_URL.  */
+
+METADATA['ja'].extras = METADATA['ja'].extras.concat([
+ /* TODO Remove standard resources from here, such as below
+ */
+  {
+    "lang": "ja",
+    "title": "Gaming Everywhere",
+    "category": "",
+    "summary": "東京ゲームショウ 2014 の基調講演より。",
+    "url": "https://www.youtube.com/watch?v=xelYnWcYkuE",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "https://img.youtube.com/vi/xelYnWcYkuE/hqdefault.jpg",
+    "type": "youtube"
+  },
+  {
+    "lang": "ja",
+    "title": "Playtime Tokyo",
+    "category": "",
+    "summary": "アプリビジネスのノウハウを各担当者が講演しました。",
+    "url": "https://www.youtube.com/playlist?list=PLCOC_kP3nqGIHEgwm9mybvA04Vn4Cg9nn",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "https://img.youtube.com/vi/lJdjY3z6-LY/hqdefault.jpg",
+    "type": "youtube"
+  },
+  {
+    "lang": "ja",
+    "title": "Android Wear 関連の動画に日本語字幕が付きました",
+    "category": "",
+    "summary": "",
+    "url": "https://googledevjp.blogspot.jp/2014/12/android-wear.html",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "https://i1.ytimg.com/vi/4JcDYkgqksY/maxresdefault.jpg",
+    "type": "blog"
+  },
+  {
+    "lang": "ja",
+    "title": "Android Studio 1.0 をリリースしました",
+    "category": "",
+    "summary": "",
+    "url": "https://googledevjp.blogspot.jp/2014/12/android-studio-10.html",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "https://3.bp.blogspot.com/-1hV3sD1At74/VIaQSWBasUI/AAAAAAAABAU/9vYLJMsmMuQ/s1600/studio-logo.png",
+    "type": "blog"
+  },
+  {
+    "lang": "ja",
+    "title": "Google Play 開発者サービス 6.5 のご紹介",
+    "category": "",
+    "summary": "",
+    "url": "https://googledevjp.blogspot.jp/2014/12/google-play-65.html",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "https://1.bp.blogspot.com/-4BNREC0Jojo/VGo7ahW35wI/AAAAAAAABAc/9thZl94F6fY/s1600/GMS%2B-%2BRelease%2BBlog%2BNacho%2B-%2BMap%2BToolbar.png",
+    "type": "blog"
+  },
+  {
+    "lang": "ja",
+    "title": "Alpha and Beta Testing",
+    "category": "",
+    "summary": "アプリのローンチにまつわるリスクを最小限にするために必須のツールです。[英語コンテンツ]",
+    "url": "intl/ja/distribute/googleplay/developer-console.html#alpha-beta",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "images/gp-dc-ab.png",
+    "type": "distribute"
+  },
+  {
+    "lang": "ja",
+    "title": "Finding Success on Google Play",
+    "category": "",
+    "summary": "Google Play での成功の秘訣がこの一冊に。[英語コンテンツ]",
+    "url": "intl/ja/distribute/googleplay/guide.html",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "distribute/images/play_dev_guide_b.jpg",
+    "type": "distribute"
+  },
+  {
+    "lang": "ja",
+    "title": "Google Play アプリ ポリシー センター",
+    "category": "",
+    "summary": "",
+    "url": "https://support.google.com/googleplay/android-developer/answer/4430948?hl=ja",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "https://storage.googleapis.com/support-kms-prod/SNP_712EA2784949DDF085C46E3BE7B1DC618A09_4389356_en_v0",
+    "type": "distribute"
+  },
+  {
+    "lang": "ja",
+    "title": "Wear App Quality",
+    "category": "",
+    "summary": "いよいよウェアラブルの時代が到来。[英語コンテンツ]",
+    "url": "intl/ja/distribute/essentials/quality/wear.html",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "distribute/images/gp-wear-quality.png",
+    "type": "distribute"
+  },
+  {
+    "lang": "ja",
+    "title": "Google Cloud Platform が支える、新感覚リアルタイム RPG ユニゾンリーグ - 株式会社エイチームの GCP 導入事例",
+    "category": "",
+    "summary": "スケーラブルなバックエンドを実現する Google Cloud Platform の最新導入事例。",
+    "url": "https://googleforwork-japan.blogspot.jp/2014/12/gcp-google-cloud-platform-rpg-gcp.html",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "https://3.bp.blogspot.com/-xp7KoPkbne4/VI_PfoFil3I/AAAAAAAAA3U/-k1UZ0zjCBc/s1600/unison-league.jpeg",
+    "type": "distribute"
+  },
+  {
+    "lang": "ja",
+    "title": "Monetize with Ads",
+    "category": "",
+    "summary": "アプリ内広告成功のコツがここに。[英語コンテンツ]",
+    "url": "intl/ja/distribute/monetize/ads.html",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "distribute/images/advertising.jpg",
+    "type": "distribute"
+  },
+]);
+
+//must use intl/nn url to override a translated resource
+METADATA['ja'].carousel = {
+  "intl/ja/distribute/googleplay/guide.html": {
+    "image": "images/distribute/hero-secrets-to-app-success.jpg",
+    "title": "Secrets to App Success on Google Play",
+    "summary": "Get the updated guide full of useful features, tips, and best practices that will help you grow a successful app or game business on Google Play.",
+  },
+};
+
+/**
+ * Static metadata collections.
+ */
+METADATA['ja'].collections = {
+  "launch/static/ja": {
+    "title": "",
+    "resources": [
+      "https://www.youtube.com/watch?v=xelYnWcYkuE",
+      "https://www.youtube.com/playlist?list=PLCOC_kP3nqGIHEgwm9mybvA04Vn4Cg9nn",
+      "https://googledevjp.blogspot.jp/2014/12/android-wear.html",
+      "https://googledevjp.blogspot.jp/2014/12/android-studio-10.html",
+      "https://googledevjp.blogspot.jp/2014/12/google-play-65.html",
+      "distribute/googleplay/developer-console.html#alpha-beta",
+      "distribute/googleplay/guide.html",
+      "distribute/essentials/quality/core.html",
+      "https://support.google.com/googleplay/android-developer/answer/4430948?hl=ja",
+      "support.html",
+      "distribute/essentials/quality/wear.html",
+      "training/tv/start/index.html",
+      "https://googleforwork-japan.blogspot.jp/2014/12/gcp-google-cloud-platform-rpg-gcp.html",
+      "distribute/monetize/ads.html"
+    ]
+  },
+};
\ No newline at end of file
diff --git a/docs/html/jd_extras_ko.js b/docs/html/jd_extras_ko.js
new file mode 100644
index 0000000..8d9059c
--- /dev/null
+++ b/docs/html/jd_extras_ko.js
@@ -0,0 +1,120 @@
+/* Metadata represendations of resources that are outside of the autogenerated
+   local resource lists, or that override local resource representations.
+
+   Resources listed here are referenced from sitemap sections and collections,
+   matched by url string if there is no resource existing in ALL_RESOURCES.
+
+   Currently, these articles can override only the generated resources
+   in DISTRIBUTE_RESOURCES. A representation defined here will not be applied
+   when a collection or section specifies a url that's not in DISTRIBUTE_RESOURCEs.
+   Also
+   So if a section url refers to a static doc that's
+   not in a distribute section, you need to create an item for
+   it in this file. Fix is to compare across
+   ALL_RESOURCES_BY_URL.  */
+
+METADATA['ko'].extras = METADATA['ko'].extras.concat([
+ /* TODO Remove standard resources from here, such as below
+ */
+  {
+    "lang": "ko",
+    "title": "구글 플레이 2015년 비전",
+    "category": "",
+    "summary": "G-Star 구글 컨퍼런스",
+    "url": "https://www.youtube.com/watch?v=7X9Ue0Nfdh4&index=2&list=PL_WJkTbDHdBksDBRoqfeyLchEQqBAOlNl",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "https://img.youtube.com/vi/7X9Ue0Nfdh4/hqdefault.jpg",
+    "type": "youtube"
+  },
+  {
+    "lang": "ko",
+    "title": "구글 플레이 게임",
+    "category": "",
+    "summary": "게임 프로필, 퀘스트, 세이브드 게임 등의 신기능 소개",
+    "url": "https://www.youtube.com/watch?v=83FpwuschCQ",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "https://img.youtube.com/vi/83FpwuschCQ/hqdefault.jpg",
+    "type": "youtube"
+  },
+  {
+    "lang": "ko",
+    "title": "안드로이드 5.0 롤리팝을 맞이하는 개발자를 위한 안내서",
+    "category": "",
+    "summary": "",
+    "url": "https://googledevkr.blogspot.com/2014/11/android50guidefordevelopers.html",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "https://lh5.googleusercontent.com/0Gx4Ob_WvIgNOMv3hVMuUm4O7KuSWyxCEFIvy39_6fgXh2q2azqjZf3bpZoEk-LMW-K8GwYMfyYfMUAwp38hhPQ6WFNnddhN2E2_GF3-XBQI_qjhISviz10h_mGgDWsZKA",
+    "type": "blog"
+  },
+  {
+    "lang": "ko",
+    "title": "안드로이드 앱을 위한 머티리얼 디자인 체크 리스트",
+    "category": "",
+    "summary": "",
+    "url": "https://googledevkr.blogspot.com/2014/10/material-design-on-android-checklist.html",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "https://lh4.googleusercontent.com/JKoxeDdmsj6gYHV8rmp96U1jHj7FKeMzGBaaFu35kXp5EpJR9Ei9MQFAYghjwJoycdgydw-FZTuFNY8pDx63MWhy37rKC96ajoDXEMzvo9W0sj5yC2-uSYJdhpazVOP2cA",
+    "type": "blog"
+  },
+  {
+    "lang": "ko",
+    "title": "App Compat 라이브러리",
+    "category": "",
+    "summary": "",
+    "url": "https://googledevkr.blogspot.com/2014/10/appcompat-v21-material-design-for-pre.html",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "https://2.bp.blogspot.com/-7fF9ayZ6PgI/U9iFpk5FNEI/AAAAAAAAAs0/4P4SCvdB_4M/s640/image00.png",
+    "type": "blog"
+  },
+  {
+    "lang": "ko",
+    "title": "구글 플레이 게임 서비스",
+    "category": "",
+    "summary": "다양한 구글 플레이 게임 서비스 기능 알아보기 [영문]",
+    "url": "intl/ko/google/play-services/games.html",
+    "group": "",
+    "keywords": [],
+    "tags": [],
+    "image": "https://developers.google.com/games/services/images/gamescreen3.jpg",
+    "type": "distribute"
+  },
+]);
+
+//must use intl/nn to override translated resources
+METADATA['ko'].carousel = {
+};
+
+/**
+ * Static metadata collections.
+ */
+METADATA['ko'].collections = {
+  "launch/static/ko": {
+    "title": "",
+    "resources": [
+      "https://www.youtube.com/watch?v=7X9Ue0Nfdh4&index=2&list=PL_WJkTbDHdBksDBRoqfeyLchEQqBAOlNl",
+      "https://www.youtube.com/watch?v=83FpwuschCQ",
+      "https://googledevkr.blogspot.com/2014/11/android50guidefordevelopers.html",
+      "https://googledevkr.blogspot.com/2014/10/material-design-on-android-checklist.html",
+      "https://googledevkr.blogspot.com/2014/10/appcompat-v21-material-design-for-pre.html",
+      "distribute/googleplay/developer-console.html#alpha-beta",
+      "distribute/googleplay/guide.html",
+      "distribute/essentials/quality/core.html",
+      "https://support.google.com/googleplay/android-developer/answer/4430948?hl=ko",
+      "support.html",
+      "distribute/essentials/quality/wear.html",
+      "tv/index.html",
+      "google/play-services/games.html",
+      "distribute/monetize/ads.html"
+    ]
+  },
+};
\ No newline at end of file
diff --git a/docs/html/jd_extras_ru.js b/docs/html/jd_extras_ru.js
new file mode 100644
index 0000000..d6c873c
--- /dev/null
+++ b/docs/html/jd_extras_ru.js
@@ -0,0 +1,13 @@
+
+//must use intl/nn to override translated resources
+METADATA['ru'].carousel = {
+  "intl/ru/distribute/googleplay/guide.html": {
+    "image": "images/distribute/hero-secrets-to-app-success.jpg",
+  },
+};
+
+/**
+ * Static metadata collections for this language.
+ */
+METADATA['ru'].collections = {
+};
\ No newline at end of file
diff --git a/docs/html/jd_extras_zh-cn.js b/docs/html/jd_extras_zh-cn.js
new file mode 100644
index 0000000..cb1ccb7
--- /dev/null
+++ b/docs/html/jd_extras_zh-cn.js
@@ -0,0 +1,291 @@
+/* Metadata represendations of resources that are outside of the autogenerated
+ local resource lists, or that override local resource representations.
+
+ Resources listed here are referenced from sitemap sections and collections,
+ matched by url string if there is no resource existing in ALL_RESOURCES.
+
+ Currently, these articles can override only the generated resources
+ in DISTRIBUTE_RESOURCES. A representation defined here will not be applied
+ when a collection or section specifies a url that's not in DISTRIBUTE_RESOURCEs.
+ Also
+ So if a section url refers to a static doc that's
+ not in a distribute section, you need to create an item for
+ it in this file. Fix is to compare across
+ ALL_RESOURCES_BY_URL.  */
+
+
+
+METADATA['zh-cn'].extras = METADATA['zh-cn'].extras.concat([
+  {
+    "title":"Google Play应用政策中心",
+    "category":"google play",
+    "summary":"一个方便你了解Google Play政策和指南的中心资源。",
+    "url":"https://support.google.com/googleplay/android-developer/answer/4430948?hl=zh-Hans",
+    "group":"",
+    "lang":"zh-cn",
+    "keywords": [],
+    "tags": [],
+    "image":"http://storage.googleapis.com/support-kms-prod/SNP_712EA2784949DDF085C46E3BE7B1DC618A09_4389397_en_v0",
+    "type":"distribute"
+  },
+  {
+    "lang": "zh-cn",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/1169947?hl=zh-Hans",
+    "timestamp": 1194884220000,
+    "image": "images/play_dev.jpg",
+    "title": "以多种货币销售应用",
+    "summary": "如何在Google Play为应用定价",
+    "keywords": [],
+    "type": "distribute",
+    "category": "guide"
+  },
+  {
+    "title": "支持向Google Play用户发布应用的地区",
+    "lang": "zh-cn",
+    "category":"",
+    "summary": "支持向Google Play用户发布应用的国家/地区。",
+    "url":"https://support.google.com/googleplay/android-developer/answer/138294?hl=zh-Hans",
+    "group":"",
+    "keywords": [],
+    "tags": [],
+    "image":"images/play_dev.jpg",
+    "type":"google"
+  },
+  {
+    "lang": "zh-cn",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/188189?hl=zh-Hans",
+    "timestamp": 1194884220000,
+    "image": "images/play_dev.jpg",
+    "title": "针对Google Play为你的应用内容分级",
+    "summary": "如何为你的应用内容分级。",
+    "keywords": [],
+    "type": "support",
+    "category": ""
+  },
+  {
+    "lang": "zh-cn",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/113477?hl=zh-Hans",
+    "timestamp": 1194884220000,
+    "image": "images/play_dev.jpg",
+    "title": "为用户提供支持",
+    "summary": "为用户提供支持的各种选择。",
+    "keywords": [],
+    "type": "support",
+    "category": ""
+  },
+  {
+    "lang": "zh-cn",
+    "group": "",
+    "tags": [],
+    "url": "https://play.google.com/apps/publish/?hl=zh-Hans",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "Google Play 开发者控制台",
+    "summary": "发布应用的开发者控制台",
+    "keywords": [],
+    "type": "guide",
+    "category": ""
+  },
+  {
+    "lang": "zh-cn",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/topic/2364761?hl=zh-Hans",
+    "timestamp": 1194884220000,
+    "image": "images/play_dev.jpg",
+    "title": "政策和最佳做法",
+    "summary": "内容政策和流程",
+    "keywords": [],
+    "type": "distribute",
+    "category": ""
+  },
+  {
+    "lang": "zh-cn",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/138412?hl=zh-Hans",
+    "timestamp": 1194884220000,
+    "image": "images/play_dev.jpg",
+    "title": "各国家/地区获许定价范围和货币",
+    "summary": "各国家/地区获许定价范围和货币列表",
+    "keywords": [],
+    "type": "guide",
+    "category": ""
+  },
+  {
+    "lang": "zh-cn",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/112622?hl=zh-Hans",
+    "timestamp": 1194884220000,
+    "image": "images/play_dev.jpg",
+    "title": "交易费用",
+    "summary": "销售的应用和应用内产品的交易费。",
+    "keywords": [],
+    "type": "guide",
+    "category": ""
+  },
+  {
+    "lang": "zh-cn",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/138000?hl=zh-Hans",
+    "timestamp": 1194884220000,
+    "image": "images/play_dev.jpg",
+    "title": "税率",
+    "summary": "如何设置不同国家/地区的税率",
+    "keywords": [],
+    "type": "guide",
+    "category": ""
+  },
+  {
+    "lang": "zh-cn",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/113475?hl=zh-Hans",
+    "timestamp": 1194884220000,
+    "image": "images/play_dev.jpg",
+    "title": "类别",
+    "summary": "应用的类别列表。",
+    "keywords": [],
+    "type": "guide",
+    "category": ""
+  },
+  {
+    "lang": "zh-cn",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/113476?hl=zh-Hans",
+    "timestamp": 1194884220000,
+    "image": "images/play_dev.jpg",
+    "title": "更新应用",
+    "summary": "更新Google Play应用的要求。",
+    "keywords": [],
+    "type": "guide",
+    "category": ""
+  },
+  {
+    "lang": "zh-cn",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/1153479?hl=zh-Hans",
+    "timestamp": 1194884220000,
+    "image": null,
+    "title": "应用内结算",
+    "summary": "如何正确设置应用内商品和订阅结算。",
+    "keywords": [],
+    "type": "guide",
+    "category": ""
+  },
+  {
+    "lang": "zh-cn",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/googleplay/android-developer/answer/1078870?hl=zh-Hans",
+    "timestamp": 1194884220000,
+    "image": "images/play_dev.jpg",
+    "title": "为你的应用的图片资源",
+    "summary": "如何在你的应用的商品详情页面上添加图片资源。",
+    "keywords": [],
+    "type": "guide",
+    "category": ""
+  },
+  {
+    "lang": "zh-cn",
+    "group": "",
+    "tags": [],
+    "url": "https://support.google.com/payments/answer/2741495?hl=zh-Hans",
+    "timestamp": null,
+    "image": null,
+    "title": "退回訂單款項",
+    "summary": "如何退还已收取的订单款项。",
+    "keywords": [],
+    "type": "guide",
+    "category": ""
+  },
+  {
+    "lang": "zh-cn",
+    "group": "",
+    "tags": ["localization", "pricing", "developer support"],
+    "url": "https://support.google.com/googleplay/android-developer/table/3541286?hl=zh-Hans",
+    "timestamp": null,
+    "image": "images/play_dev.jpg",
+    "title": "支持向Google Play用户发布应用的地区",
+    "summary": "支持向Google Play用户发布应用的国家/地区。",
+    "keywords": [],
+    "type": "distribute",
+    "category": ""
+  },
+  {
+    "lang": "zh-cn",
+    "group": "",
+    "tags": [],
+    "url": "https://developers.google.com/edu/guidelines?hl=zh-Hans",
+    "timestamp": null,
+    "image": "https://developer.android.com/distribute/images/edu-guidelines.jpg",
+    "title": "Education Guidelines",
+    "summary": "These guidelines and requirements help you develop great apps for students, which offer compelling content and an intuitive user experience on Android tablets.",
+    "keywords": [],
+    "type": "",
+    "category": ""
+  },
+]);
+
+/**
+ * Static metadata collections.
+ */
+METADATA['zh-cn'].collections = {
+  "overview/zhcn/1": {
+    "title": "",
+    "resources": [
+      "intl/zh-cn/distribute/essentials/quality/core.html",
+      "intl/zh-cn/distribute/essentials/quality/tablets.html",
+      "intl/zh-cn/distribute/tools/launch-checklist.html",
+      "intl/zh-cn/tools/publishing/publishing_overview.html",
+      "intl/zh-cn/distribute/tools/localization-checklist.html"
+    ]
+  },
+  "overview/zhcn/2": {
+    "title": "",
+    "resources": [
+      "intl/zh-cn/google/play/billing/index.html",
+      "intl/zh-cn/google/play/billing/api.html",
+      "intl/zh-cn/google/play/billing/billing_admin.html",
+      "intl/zh-cn/google/play/billing/billing_testing.html",
+      "intl/zh-cn/google/play/billing/billing_best_practices.html"
+    ]
+  },
+  "overview/zhcn/3": {
+    "title": "",
+    "resources": [
+      "https://play.google.com/intl/en_us/badges/",
+      "intl/zh-cn/distribute/tools/promote/device-art.html",
+      "intl/zh-cn/distribute/tools/promote/linking.html",
+      "intl/zh-cn/distribute/tools/promote/brand.html",
+      "intl/zh-cn/tools/help/proguard.html"
+    ]
+  },
+  "overview/zhcn/4": {
+    "title": "",
+    "resources": [
+      "intl/zh-cn/design/style/writing.html",
+      "intl/zh-cn/training/basics/fragments/fragment-ui.html",
+      "intl/zh-cn/training/multiscreen/index.html",
+      "intl/zh-cn/training/monitoring-device-state/index.html"
+    ]
+  },
+  "overview/carousel/zhcn": {
+    "title": "",
+    "resources": [
+      "https://www.youtube.com/watch?v=vGV7FHGzpFU",
+      "https://www.youtube.com/watch?v=aqc3ZOTzpdk",
+      "https://www.youtube.com/watch?v=jaNrJ8uyLSc"
+    ]
+  },
+};
\ No newline at end of file
diff --git a/docs/html/jd_extras_zh-tw.js b/docs/html/jd_extras_zh-tw.js
new file mode 100644
index 0000000..f41598e
--- /dev/null
+++ b/docs/html/jd_extras_zh-tw.js
@@ -0,0 +1,13 @@
+
+//must use intl/nn to override translated resources
+METADATA['zh-tw'].carousel = {
+  "intl/zh-tw/distribute/googleplay/guide.html": {
+    "image": "images/distribute/hero-secrets-to-app-success.jpg",
+  },
+};
+
+/**
+ * Static metadata collections for this language.
+ */
+METADATA['zh-tw'].collections = {
+};
\ No newline at end of file
diff --git a/docs/html/ndk/downloads/index.jd b/docs/html/ndk/downloads/index.jd
index 391a7d5..f674993 100644
--- a/docs/html/ndk/downloads/index.jd
+++ b/docs/html/ndk/downloads/index.jd
@@ -1,32 +1,8 @@
 ndk=true
 page.template=sdk
-
-
-ndk.mac64_download=android-ndk-r10e-darwin-x86_64.bin
-ndk.mac64_bytes=388937326
-ndk.mac64_checksum=2cb8893a5701603519d38a7e04c50e81
-
-ndk.linux64_download=android-ndk-r10e-linux-x86_64.bin
-ndk.linux64_bytes=401522849
-ndk.linux64_checksum=19af543b068bdb7f27787c2bc69aba7f
-
-ndk.linux32_download=android-ndk-r10e-linux-x86.bin
-ndk.linux32_bytes=394281908
-ndk.linux32_checksum=c3edd3273029da1cbd2f62c48249e978
-
-ndk.win64_download=android-ndk-r10e-windows-x86_64.exe
-ndk.win64_bytes=419616132
-ndk.win64_checksum=8412bb4991a95e08fda50b5a44d95df7
-
-ndk.win32_download=android-ndk-r10e-windows-x86.exe
-ndk.win32_bytes=396563176
-ndk.win32_checksum=1a82445baaf62aec3a46386ab1e5772c
-
-
-
 page.title=NDK Downloads
-@jd:body
 
+@jd:body
 
 <div id="tos" style="display:none;width:760px;height:0;margin:0 auto">
 
@@ -320,7 +296,7 @@
 <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
 <label id="agreeLabel" for="agree">I have read and agree with the above terms and conditions</label>
 </p>
-<p><a href="" class="button disabled ndk" id="downloadForRealz" onclick="return onDownloadNdkForRealz(this);"></a></p>
+<p><a href="" class="dac-button dac-raised dac-primary disabled ndk" id="downloadForRealz" onclick="return onDownloadNdkForRealz(this);"></a></p>
 </div>
 
 
diff --git a/docs/html/ndk/guides/guides_toc_new.cs b/docs/html/ndk/guides/guides_toc_new.cs
new file mode 100644
index 0000000..981eb51
--- /dev/null
+++ b/docs/html/ndk/guides/guides_toc_new.cs
@@ -0,0 +1,75 @@
+<?cs # Table of contents for Dev Guide.
+
+       For each document available in translation, add an localized title to this TOC.
+       Do not add localized title for docs not available in translation.
+       Below are template spans for adding localized doc titles. Please ensure that
+       localized titles are added in the language order specified below.
+?>
+
+<ul id="nav">
+   <li class="nav-section">
+      <div class="nav-section-header"><a href="<?cs var:toroot ?>ndk/guides/index.html">
+      <span class="en">Getting Started</span></a></div>
+      <ul>
+         <li><a href="<?cs var:toroot ?>ndk/guides/setup.html">Setup</a></li>
+         <li><a href="<?cs var:toroot ?>ndk/guides/concepts.html">Concepts</a></li>
+      </ul>
+   </li>
+
+   <li class="nav-section">
+      <div class="nav-section-header"><a href="<?cs var:toroot ?>ndk/guides/build.html">
+      <span class="en">
+      Building</span></a></div>
+      <ul>
+         <li><a href="<?cs var:toroot ?>ndk/guides/android_mk.html">Android.mk</a></li>
+         <li><a href="<?cs var:toroot ?>ndk/guides/application_mk.html">Application.mk</a></li>
+         <li><a href="<?cs var:toroot ?>ndk/guides/ndk-build.html">ndk-build</a></li>
+         <li><a href="<?cs var:toroot ?>ndk/guides/standalone_toolchain.html">Standalone Toolchain
+         </a></li>
+      </ul>
+   </li>
+
+   <li class="nav-section">
+      <div class="nav-section-header"><a href="<?cs var:toroot ?>ndk/guides/arch.html">
+      <span class="en">Architectures and CPUs</span></a></div>
+      <ul>
+         <li><a href="<?cs var:toroot ?>ndk/guides/abis.html">ABI Management</a></li>
+         <li><a href="<?cs var:toroot ?>ndk/guides/cpu-arm-neon.html">NEON</a></li>
+         <li><a href="<?cs var:toroot ?>ndk/guides/x86.html">x86</a></li>
+         <li><a href="<?cs var:toroot ?>ndk/guides/x86-64.html">x86-64</a></li>
+         <li><a href="<?cs var:toroot ?>ndk/guides/mips.html">MIPS</a></li>
+         <li><a href="<?cs var:toroot ?>ndk/guides/cpu-features.html">The cpufeatures Library</a>
+         </li>
+      </ul>
+   </li>
+
+   <li class="nav-section">
+      <div class="nav-section-header"><a href="<?cs var:toroot ?>ndk/guides/debug.html">
+      <span class="en">Debugging</span></a></div>
+      <ul>
+         <li><a href="<?cs var:toroot ?>ndk/guides/ndk-gdb.html">ndk-gdb</a></li>
+         <li><a href="<?cs var:toroot ?>ndk/guides/ndk-stack.html">ndk-stack</a></li>
+      </ul>
+   </li>
+
+   <li class="nav-section">
+      <div class="nav-section-header"><a href="<?cs var:toroot ?>ndk/guides/libs.html">
+      <span class="en">Libraries</span></a></div>
+      <ul>
+      <li><a href="<?cs var:toroot ?>ndk/guides/prebuilts.html">Prebuilt Libraries</a></li>
+      <li><a href="<?cs var:toroot ?>ndk/guides/cpp-support.html">C++ Support</a></li>
+      <li><a href="<?cs var:toroot ?>ndk/guides/stable_apis.html">Stable APIs</a></li>
+
+      </ul>
+   </li>
+
+</ul>
+
+
+<script type="text/javascript">
+<!--
+    buildToggleLists();
+    changeNavLang(getLangPref());
+//-->
+</script>
+
diff --git a/docs/html/ndk/index.jd b/docs/html/ndk/index.jd
index a88c15d..fc1c595 100644
--- a/docs/html/ndk/index.jd
+++ b/docs/html/ndk/index.jd
@@ -40,11 +40,12 @@
     <i class="dac-sprite dac-arrow-down-gray"></i>
   </a>
 </div>
-<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">
+<section class="dac-section dac-gray dac-small" id="latest"><div class="wrap">
   <h2 class="norule">Latest</h2>
   <div class="resource-widget resource-flow-layout col-16"
        data-query="type:blog+tag:ndk"
        data-cardSizes="6x6"
        data-maxResults="9"
+       data-items-per-page="6"
        data-initial-results="3"></div>
 </div></section>
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index 5db013c..7d733a6 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -1,58 +1,10 @@
 page.title=Download Android Studio and SDK Tools
-page.tags=sdk, android studio
+page.tags="sdk, android studio,tools"
 page.template=sdk
 page.image=images/cards/android-studio_2x.png
 header.hide=1
 page.metaDescription=Download the official Android IDE and developer tools to build apps for Android phones, tablets, wearables, TVs, and more.
 
-studio.version=1.5.1.0
-
-studio.linux_bundle_download=android-studio-ide-141.2456560-linux.zip
-studio.linux_bundle_bytes=380943097
-studio.linux_bundle_checksum=b8460a2197abe26979d88e3b01b3c8bfd80a37db
-
-studio.mac_bundle_download=android-studio-ide-141.2456560-mac.dmg
-studio.mac_bundle_bytes=367456698
-studio.mac_bundle_checksum=d0807423985757195ad5ae4717d580deeba1dbd8
-
-studio.win_bundle_download=android-studio-ide-141.2456560-windows.zip
-studio.win_bundle_bytes=375635150
-studio.win_bundle_checksum=64882fb967f960f2142de239200104cdc9b4c75b
-
-
-studio.win_bundle_exe_download=android-studio-bundle-141.2456560-windows.exe
-studio.win_bundle_exe_bytes=1209163328
-studio.win_bundle_exe_checksum=6ffe608b1dd39041a578019eb3fedb5ee62ba545
-
-studio.win_notools_exe_download=android-studio-ide-141.2456560-windows.exe
-studio.win_notools_exe_bytes=351419656
-studio.win_notools_exe_checksum=8d016b90bf04ebac6ce548b1976b0c8a4f46b5f9
-
-
-
-
-sdk.linux_download=android-sdk_r24.4.1-linux.tgz
-sdk.linux_bytes=326412652
-sdk.linux_checksum=725bb360f0f7d04eaccff5a2d57abdd49061326d
-
-sdk.mac_download=android-sdk_r24.4.1-macosx.zip
-sdk.mac_bytes=102781947
-sdk.mac_checksum=85a9cccb0b1f9e6f1f616335c5f07107553840cd
-
-sdk.win_download=android-sdk_r24.4.1-windows.zip
-sdk.win_bytes=199701062
-sdk.win_checksum=66b6a6433053c152b22bf8cab19c0f3fef4eba49
-
-
-sdk.win_installer=installer_r24.4.1-windows.exe
-sdk.win_installer_bytes=151659917
-sdk.win_installer_checksum=f9b59d72413649d31e633207e31f456443e7ea0b
-
-
-
-
-
-
 @jd:body
 
 <style type="text/css">
@@ -257,7 +209,7 @@
 <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
 <label id="agreeLabel" for="agree">I have read and agree with the above terms and conditions</label>
 </p>
-<p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
+<p><a href="" class="dac-button dac-raised dac-primary disabled ndk" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
 </div>
 
 
@@ -278,7 +230,7 @@
 
 <div style="color: #fff; width:226px; height:0; overflow:visible; position:absolute; top:40px; left:25px">
 
-<h1 class="studio-logo" style="margin:0 0 35px !important">Android Studio</h1>
+<h1 class="studio-logo" style="margin:0 0 35px !important;padding:0 !important">Android Studio</h1>
 
 <p style="font-size: 16px; color:#bbb; position: absolute;left: 297px; top: 5px; display: block;
 width: 400px;text-align: center;">The official Android IDE</p>
diff --git a/docs/html/sdk/installing/adding-packages.jd b/docs/html/sdk/installing/adding-packages.jd
index 88619bd..2911c38 100644
--- a/docs/html/sdk/installing/adding-packages.jd
+++ b/docs/html/sdk/installing/adding-packages.jd
@@ -31,7 +31,7 @@
   line-height:20px;
   padding:0 0 0 20px;
   margin:0 0 20px 0;
-  display:inline-block;
+  display:inline;
   font-weight:normal;
 }
 ol.large > li:nth-child(1):before {
diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd
index 1e732da..203d2ff 100644
--- a/docs/html/sdk/installing/index.jd
+++ b/docs/html/sdk/installing/index.jd
@@ -32,16 +32,13 @@
 <p>Android Studio provides everything you need to start developing apps for Android, including
 the Android Studio IDE and the Android SDK tools.</p>
 
-<p>If you didn't download Android Studio, go <a href="{@docRoot}sdk/index.html"
-><b>download Android Studio now</b></a>, or switch to the
-<a href="{@docRoot}sdk/installing/index.html?pkg=tools">stand-alone SDK Tools
-install</a> instructions.</p>
+<p class="note"><strong>Note:</strong> If you have not yet downloaded Android Studio, <a href="{@docRoot}sdk/index.html"
+><b>download</b></a> it now.</p>
 
 
-<p>Before you set up Android Studio, be sure you have installed
-JDK 6 or higher (the JRE alone is not sufficient)&mdash;JDK 7 is required when
-developing for Android 5.0 and higher. To check if you
-have JDK installed (and which version), open a terminal and type <code>javac -version</code>.
+<p>Before installing Android Studio, make sure you have JDK 6 or higher installed&mdash;the JRE
+alone is not sufficient. When developing for Android 5.0 (API level 21) and higher, you will need to install JDK 7.
+To check if you have the correct version of the JDK installed, open a terminal and type <code>javac -version</code>.
 If the JDK is not available or the version is lower than version 6, download the
 <a href="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html" class="external-link"
 >Java SE Development Kit 7</a>.</p>
@@ -57,10 +54,10 @@
 
 <p><b>To set up Android Studio on Windows:</b></p>
   <ol>
-    <li>Launch the <code>.exe</code> file you just downloaded.</li>
+    <li>Launch the {@code .exe} file you downloaded.</li>
     <li>Follow the setup wizard to install Android Studio and any necessary SDK tools.
 
-    <p>On some Windows systems, the launcher script does not find where Java is installed.
+    <p>On some Windows systems, the launcher script does not find where the JDK is installed.
       If you encounter this problem,
       you need to set an environment variable indicating the correct location.</p>
       <p>Select <strong>Start menu > Computer > System Properties >
@@ -69,11 +66,10 @@
       your JDK folder, for example <code>C:\Program Files\Java\jdk1.7.0_21</code>.</p>
     </p>
     </li>
-
   </ol>
 
 
-<p>The individual tools and other SDK packages are saved outside the Android Studio application
+<p>The individual tools and other SDK packages used by Android Studio are installed in a separate
 directory. If you need to access the tools directly, use a terminal to navigate to the location
 where they are installed. For example:</p>
 <p><code>\Users\&lt;user&gt;\sdk\</code></p>
@@ -87,7 +83,7 @@
 
 <p><b>To set up Android Studio on Mac OSX:</b></p>
   <ol>
-    <li>Launch the {@code .dmg} file you just downloaded.</li>
+    <li>Launch the {@code .dmg} file you downloaded.</li>
     <li>Drag and drop Android Studio into the Applications folder.
     <li>Open Android Studio and follow the setup wizard to install any necessary SDK tools.
     </li>
@@ -106,30 +102,30 @@
 <p><b>To set up Android Studio on Linux:</b></p>
 
   <ol>
-    <li>Unpack the downloaded ZIP file into an
+    <li>Unpack the {@code .zip} file you downloaded to an
         appropriate location for your applications.
-    <li>To launch Android Studio, navigate to the {@code android-studio/bin/} directory
-    in a terminal and execute {@code studio.sh}.
+    <li>To launch Android Studio, open a terminal, navigate to the {@code android-studio/bin/} directory,
+     and execute {@code studio.sh}.
       <p>You may want to add {@code android-studio/bin/} to your PATH environmental
       variable so that you can start Android Studio from any directory.</p>
     </li>
     <li>If the SDK is not already installed, follow the setup wizard to install the SDK and any
     necessary SDK tools.
-    <p class="note"><strong>Note:</strong> You may also need to install the ia32-libs,
-    lib32ncurses5-dev, and lib32stdc++6 packages. These packages are required to support 32-bit apps
-    on a 64-bit machine. </p>
+    <p class="note"><strong>Note:</strong> To support 32-bit apps
+    on a 64-bit machine, you will need to install the ia32-libs,
+    lib32ncurses5-dev, and lib32stdc++6 packages.</p>
     </li>
   </ol>
 
 </div><!-- end linux -->
 </div><!-- end procedure box -->
 
-<p>Android Studio is now ready and loaded with the Android developer tools, but there are still a
-couple packages you should add to make your Android SDK complete.</p>
+<p>You can now start developing apps in Android Studio! Later on, you may want to add packages or
+update them.</p>
 
 <p class="paging-links">
 <a href="{@docRoot}sdk/installing/adding-packages.html" class="next-page-link">
-Continue: Adding SDK Packages</a></p>
+Optional: Adding SDK Packages</a></p>
 
 
 </div>
@@ -151,10 +147,9 @@
 It includes only the core SDK tools, which you can access from a command line or with a plugin
 for your favorite IDE (if available).</p>
 
-<p>If you didn't download the SDK tools, go <a href="{@docRoot}sdk/index.html#Other"
-><b>download the SDK now</b></a>,
-or switch to the <a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio
-install</a> instructions.</p>
+<p class="note"><strong>Note:</strong> If you have not yet downloaded the SDK tools, <a href="{@docRoot}sdk/index.html#Other"
+><b>download</b></a> them now. For a complete IDE and Android SDK package, we recommend <a href="{@docRoot}sdk/index.html"
+><b>downloading Android Studio</b></a>.</p>
 
 
 <div class="procedure-box">
@@ -167,14 +162,13 @@
 <p><b>To get started on Windows:</b></p>
 
 <p>Your download package is an executable file that starts an installer. The installer checks your machine
-  for required tools, such as the proper Java SE Development Kit (JDK) and installs it if necessary.
-  The installer then saves the Android SDK Tools to a specified the location outside of the Android
-  Studio directories.</p>
+  for required tools, such as the proper Java SE Development Kit (JDK), and installs them if necessary.
+  The installer then saves the Android SDK Tools to a specified location.</p>
 
 <ol>
-<li>Double-click the executable ({@code .exe} file) to start the install.</li>
-<li>Make a note of the name and location where you save the SDK on your system&mdash;you will need to
-refer to the SDK directory later when using
+<li>Double-click the {@code .exe} file to start the install.</li>
+<li>Make a note of the name and location where you saved the SDK on your system&mdash;you will need to
+refer to them later when using
 the SDK tools from the command line.</li>
 <li>Once the installation completes, the installer starts the Android SDK Manager.
 </li>
@@ -188,13 +182,14 @@
 
 <p><b>To get started on Mac OSX:</b></p>
 
-<p>Unpack the ZIP file you've downloaded. By default, it's unpacked
-into a directory named <code>android-sdk-mac_x86</code>. Move it to an appropriate location on your
-machine, such as a "Development" directory in your home directory.</p>
-
-<p>Make a note of the name and location of the SDK directory on your system&mdash;you will need to
-refer to the SDK directory later when using
-the SDK tools from the command line.</p>
+<ol>
+<li>Unpack the {@code .zip} file you downloaded. By default, the file is unpacked
+into a directory named <code>android-sdk-mac_x86</code>.</li>
+<li>Move the directory to an appropriate location on your
+machine, such as a "Development" directory in your home directory.</li>
+<li>Make a note of the name and location of the SDK directory on your system&mdash;you will need to
+refer to them later when using the SDK tools from the command line.</li>
+</ol>
 
 </div>
 
@@ -205,13 +200,11 @@
 
 <p><b>To get started on Linux:</b></p>
 
-<p>Unpack the {@code .zip} file you've downloaded. The SDK files are download separately to a
-user-specified directory. </p>
-
-<p>Make a note of the name and location of the SDK directory on your system&mdash;you will need to
-refer to the SDK directory later when using
-the SDK tools from the command line.</p>
-
+<ol>
+<li>Unpack the {@code .tgz} file you downloaded.</li>
+<li>Make a note of the name and location of the unpacked SDK directory on your system&mdash;you will need to
+refer to them later when using the SDK tools from the command line.</li>
+</ol>
 
 <h5 id="Troubleshooting" style="margin-bottom:15px"><a href='' class="expandable"
   onclick="toggleExpandable(this,'#UbuntuTrouble');return false;"
@@ -250,8 +243,8 @@
 </div><!-- end procedure box -->
 
 
-<p>The Android SDK tools are now ready to begin developing apps, but there are still a
-couple packages you should add to make your Android SDK complete.</p>
+<p>Before you can begin developing apps with the Android SDK tools, you must install a few
+additional packages.</p>
 
 <p class="paging-links">
 <a href="{@docRoot}sdk/installing/adding-packages.html" class="next-page-link">
@@ -275,11 +268,7 @@
 
 <div id="default" style="display:none">
 
-<p>If you haven't already, <b><a href="{@docRoot}sdk/index.html">download
-the Android SDK bundle for Android Studio</a></b> or the
-<a href="{@docRoot}sdk/index.html#Other">stand-alone SDK Tools</a>. </p>
-
-<p>Then, select which SDK bundle you want to install:</p>
+<p>Select the SDK bundle you want to install:</p>
 
 <div class="cols" style="margin:30px 0 60px">
 
diff --git a/docs/html/sdk/installing/studio-tips.jd b/docs/html/sdk/installing/studio-tips.jd
index 6c944ab..113388f 100644
--- a/docs/html/sdk/installing/studio-tips.jd
+++ b/docs/html/sdk/installing/studio-tips.jd
@@ -1,4 +1,7 @@
 page.title=Android Studio Tips and Tricks
+page.image=images/tools/studio-previewall.png
+page.tags="sdk", "studio", "android studio"
+meta.tags="studio"
 @jd:body
 
 <div id="qv-wrapper">
diff --git a/docs/html/sdk/sdk_vars.cs b/docs/html/sdk/sdk_vars.cs
new file mode 100644
index 0000000..c911f5a
--- /dev/null
+++ b/docs/html/sdk/sdk_vars.cs
@@ -0,0 +1,59 @@
+<?cs
+set:studio.version='1.5.1.0' ?><?cs
+
+
+set:studio.linux_bundle_download='android-studio-ide-141.2456560-linux.zip' ?><?cs
+set:studio.linux_bundle_bytes='380943097' ?><?cs
+set:studio.linux_bundle_checksum='b8460a2197abe26979d88e3b01b3c8bfd80a37db' ?><?cs
+
+set:studio.mac_bundle_download='android-studio-ide-141.2456560-mac.dmg' ?><?cs
+set:studio.mac_bundle_bytes='367456698' ?><?cs
+set:studio.mac_bundle_checksum='d0807423985757195ad5ae4717d580deeba1dbd8' ?><?cs
+
+set:studio.win_bundle_download='android-studio-ide-141.2456560-windows.zip' ?><?cs
+set:studio.win_bundle_bytes='375635150' ?><?cs
+set:studio.win_bundle_checksum='64882fb967f960f2142de239200104cdc9b4c75b' ?><?cs
+
+set:studio.win_bundle_exe_download='android-studio-bundle-141.2456560-windows.exe' ?><?cs
+set:studio.win_bundle_exe_bytes='1209163328' ?><?cs
+set:studio.win_bundle_exe_checksum='6ffe608b1dd39041a578019eb3fedb5ee62ba545' ?><?cs
+
+set:studio.win_notools_exe_download='android-studio-ide-141.2456560-windows.exe' ?><?cs
+set:studio.win_notools_exe_bytes='351419656' ?><?cs
+set:studio.win_notools_exe_checksum='8d016b90bf04ebac6ce548b1976b0c8a4f46b5f9' ?><?cs
+
+
+set:sdk.linux_download='android-sdk_r24.4.1-linux.tgz' ?><?cs
+set:sdk.linux_bytes='326412652' ?><?cs
+set:sdk.linux_checksum='725bb360f0f7d04eaccff5a2d57abdd49061326d' ?><?cs
+
+set:sdk.mac_download='android-sdk_r24.4.1-macosx.zip' ?><?cs
+set:sdk.mac_bytes='102781947' ?><?cs
+set:sdk.mac_checksum='85a9cccb0b1f9e6f1f616335c5f07107553840cd' ?><?cs
+
+set:sdk.win_download='android-sdk_r24.4.1-windows.zip' ?><?cs
+set:sdk.win_bytes='199701062' ?><?cs
+set:sdk.win_checksum='66b6a6433053c152b22bf8cab19c0f3fef4eba49' ?><?cs
+set:sdk.win_installer='installer_r24.4.1-windows.exe' ?><?cs
+set:sdk.win_installer_bytes='151659917' ?><?cs
+set:sdk.win_installer_checksum='f9b59d72413649d31e633207e31f456443e7ea0b' ?><?cs
+
+
+set:ndk.mac64_download='android-ndk-r10e-darwin-x86_64.bin' ?><?cs
+set:ndk.mac64_bytes='388937326' ?><?cs
+set:ndk.mac64_checksum='2cb8893a5701603519d38a7e04c50e81' ?><?cs
+
+set:ndk.linux64_download='android-ndk-r10e-linux-x86_64.bin' ?><?cs
+set:ndk.linux64_bytes='401522849' ?><?cs
+set:ndk.linux64_checksum='19af543b068bdb7f27787c2bc69aba7f' ?><?cs
+set:ndk.linux32_download='android-ndk-r10e-linux-x86.bin' ?><?cs
+set:ndk.linux32_bytes='394281908' ?><?cs
+set:ndk.linux32_checksum='c3edd3273029da1cbd2f62c48249e978' ?><?cs
+
+set:ndk.win64_download='android-ndk-r10e-windows-x86_64.exe' ?><?cs
+set:ndk.win64_bytes='419616132' ?><?cs
+set:ndk.win64_checksum='8412bb4991a95e08fda50b5a44d95df7' ?><?cs
+set:ndk.win32_download='android-ndk-r10e-windows-x86.exe' ?><?cs
+set:ndk.win32_bytes='396563176' ?><?cs
+set:ndk.win32_checksum='1a82445baaf62aec3a46386ab1e5772c'
+?>
\ No newline at end of file
diff --git a/docs/html/sdk/win-usb.jd b/docs/html/sdk/win-usb.jd
index cb3e7bd..c08f6fd 100644
--- a/docs/html/sdk/win-usb.jd
+++ b/docs/html/sdk/win-usb.jd
@@ -155,7 +155,7 @@
 <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
 <label id="agreeLabel" for="agree">I have read and agree with the above terms and conditions</label>
 </p>
-<p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
+<p><a href="" class="dac-button dac-raised dac-primary disabled ndk" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
 </div>
 
 
diff --git a/docs/html/support.jd b/docs/html/support.jd
index 9ef4a16..0d87961 100644
--- a/docs/html/support.jd
+++ b/docs/html/support.jd
@@ -1,8 +1,7 @@
-page.title=Developer Support
+page.title=Developer Support Resources
 page.type=about
 fullpage=1
-page.metaDescription=Resources available to help you report and resolve issues while you are developing apps for Android.
-page.image=/images/android-support-card.png
+page.metaDescription=Links to community and support resources for Android developers.
 
 @jd:body
 
diff --git a/docs/html/tools/help/proguard.jd b/docs/html/tools/help/proguard.jd
index 5482399..e26aca0 100755
--- a/docs/html/tools/help/proguard.jd
+++ b/docs/html/tools/help/proguard.jd
@@ -1,6 +1,7 @@
 page.title=ProGuard
 parent.title=Tools
 parent.link=index.html
+page.metaDescription=Use ProGuard to shrink, optimize, and obfuscate your code prior to release.
 @jd:body
 
  <div id="qv-wrapper">
diff --git a/docs/html/tools/publishing/preparing.jd b/docs/html/tools/publishing/preparing.jd
index 0b61aa7..3acaedc 100644
--- a/docs/html/tools/publishing/preparing.jd
+++ b/docs/html/tools/publishing/preparing.jd
@@ -1,4 +1,5 @@
 page.title=Preparing for Release
+page.metaDescription=Developer documentation on how to build the signed, release-ready APK. This process is the same for all Android apps.
 @jd:body
 
 <div id="qv-wrapper">
diff --git a/docs/html/tools/publishing/publishing_overview.jd b/docs/html/tools/publishing/publishing_overview.jd
index e42b2fb..167758a 100644
--- a/docs/html/tools/publishing/publishing_overview.jd
+++ b/docs/html/tools/publishing/publishing_overview.jd
@@ -1,4 +1,5 @@
 page.title=Publishing Overview
+page.metaDescription=Start here for an overview of publishing options for Android apps.
 @jd:body
 
 <div id="qv-wrapper">
diff --git a/docs/html/tools/revisions/gradle-plugin.jd b/docs/html/tools/revisions/gradle-plugin.jd
index b7d7630..20f6b34 100644
--- a/docs/html/tools/revisions/gradle-plugin.jd
+++ b/docs/html/tools/revisions/gradle-plugin.jd
@@ -584,9 +584,9 @@
 
 <h2>Updating the Android Plugin for Gradle Version</h2>
 <p>The Android Plugin for Gradle version is specified in the
-<strong>File &gt; Project Structure</strong> menu or the project-level
+<strong>File &gt; Project Structure &gt; Project</strong> menu and the project-level
 <code>build.gradle</code> file. The plugin version applies to all modules built in that
-Android Studio project. This example updates the Android Plugin for Gradle to version 1.1.0:
+Android Studio project. This example sets the Android Plugin for Gradle to version 1.1.0 from the <code>build.gradle</code> file:
 <pre>
 ...
      dependencies {
@@ -600,8 +600,8 @@
 version numbers. Using this feature can cause unexpected version updates and difficulty
 resolving version differences. </p>
 
-<p>If you're building with Gradle but using not Android Studio, the build process downloads the
-latest Android Plugin for Gradle plugin when it runs. </p>
+<p>If you're building with Gradle but not using Android Studio, the build process downloads the
+latest Android Plugin for Gradle when it runs. </p>
 
 
 
@@ -609,8 +609,8 @@
 
 <p>Android Studio requires Gradle version 2.2.1 or later. To view and
 update the Gradle version, edit the Gradle distribution reference in the
-<code>gradle/wrapper/gradle-wrapper.properties</code> file. This example shows the
-Android Plugin for Gradle version set to 2.2.1.</p>
+<code>gradle/wrapper/gradle-wrapper.properties</code> file. This example sets the
+Gradle version to 2.2.1.</p>
 
 <pre>
 ...
@@ -618,14 +618,6 @@
 ...
 </pre>
 
-
-
-
 <p>For more details about the supported Android Plugin for Gradle properties and syntax, click
 the link to the
-<a href="{@docRoot}tools/building/plugin-for-gradle.html">Plugin Language Reference</a>.</p>
-
-
-
-
-
+<a href="{@docRoot}tools/building/plugin-for-gradle.html">Plugin Language Reference</a>.</p>
\ No newline at end of file
diff --git a/docs/html/tools/studio/studio-features.jd b/docs/html/tools/studio/studio-features.jd
index 46ec79d..0894a25 100644
--- a/docs/html/tools/studio/studio-features.jd
+++ b/docs/html/tools/studio/studio-features.jd
@@ -1,6 +1,7 @@
 page.title=Features
 page.metaDescription=Learn about the Android Studio features.
-page.tags=studio, features
+page.tags="studio", "android studio", "sdk"
+page.image=images/cards/card-studio-modules_crop_2x.png
 @jd:body
 
 <div id="qv-wrapper">
diff --git a/docs/html/training/app-indexing/deep-linking.jd b/docs/html/training/app-indexing/deep-linking.jd
index 2679937..4ee7424 100644
--- a/docs/html/training/app-indexing/deep-linking.jd
+++ b/docs/html/training/app-indexing/deep-linking.jd
@@ -66,10 +66,10 @@
               android:host="www.example.com"
               android:pathPrefix="/gizmos" /&gt;
         &lt;!-- note that the leading "/" is required for pathPrefix--&gt;
-        &lt;!-- Accepts URIs that begin with "example://gizmos”
+        &lt;!-- Accepts URIs that begin with "example://gizmos” --&gt;
         &lt;data android:scheme="example"
               android:host="gizmos" /&gt;
-        --&gt;
+        
     &lt;/intent-filter&gt;
 &lt;/activity&gt;
 </pre>
diff --git a/docs/html/training/articles/keystore.jd b/docs/html/training/articles/keystore.jd
index 5323e20..a1563a7 100644
--- a/docs/html/training/articles/keystore.jd
+++ b/docs/html/training/articles/keystore.jd
@@ -1,8 +1,8 @@
 page.title=Android Keystore System
 @jd:body
 
-<div id="qv-wrapper">
-  <div id="qv">
+<div id="tb-wrapper">
+<div id="tb">
     <h2>In this document</h2>
     <ol>
       <li><a href="#SecurityFeatures">Security Features</a></li>
diff --git a/docs/html/training/articles/user-data-overview.jd b/docs/html/training/articles/user-data-overview.jd
index 42322a9..8715d36 100644
--- a/docs/html/training/articles/user-data-overview.jd
+++ b/docs/html/training/articles/user-data-overview.jd
@@ -97,15 +97,18 @@
   This also means that when you request access to a particular API call or
   query a content provider behind a permission, the user will be presented with
   a request to grant permission for the whole group rather than the specific
-  API call. For example, if you request the <code>MANAGE_ACOUNTS</code>
-  permission, the user will be asked to grant access to the <em>Identity</em>
-  group (in API level 22 and lower), which is composed of the <code>GET_ACCOUNTS</code>,
-  <code>READ_PROFILE</code>, and <code>WRITE_PROFILE</code> permissions, and
+  API call. For example, if you request the <code>WRITE_CALL_LOG</code>
+  permission, the user will be asked to grant access to the <em>PHONE</em>
+  group (in API level 23 and higher), which is composed of the
+  <code>READ_PHONE_STATE</code>, <code>CALL_PHONE</code>,
+   <code>READ_CALL_LOG</code>, <code>WRITE_CALL_LOG</code>,
+  <code>ADD_VOICEMAIL</code>,  <code>USE_SIP</code>, and
+  <code>PROCESS_OUTGOING_CALLS</code> permissions, and
   all their associated methods.
 </p>
 
 <div class="wrap">
-   <img src="{@docRoot}images/training/articles/user-data-overview-permissions-flow02.jpg">
+   <img src="{@docRoot}images/training/articles/user-data-overview-permissions-flow02.png">
 </div>
 
 <p>
@@ -142,7 +145,7 @@
 <p>
   To use these methods, the <code>READ_PHONE_STATE</code> permission must be
   declared in the app's manifest, and the associated permission group,
-  <em>Device ID and Call information</em>, will be surfaced to the user. This
+  <em>PHONE</em>, will be surfaced to the user. This
   is important, because it means the user will be asked to grant permission for
   the relevant group and all its associated permissions and API calls, rather
   than for the specific API call you're requesting.
@@ -166,7 +169,7 @@
 media player when there's a call, and to resume playback when the call is over.
 The permission seems to scare a lot of people</em>...<span
 style="font-size:.8em;color:#777"><sup><em><a
-href="#references" style="color:#777;padding-left:.1em;">1</a></em></span></p>
+href="#references" style="color:#777;padding-left:.1em;">1</a></em></sup></span></p>
 </div>
 </div>
 
@@ -182,23 +185,23 @@
 <p>
   One study<span style="font-size:.8em;color:#777"><sup><em><a href=
   "#references" style=
-  "color:#777;padding-left:.1em;">2</a></em></sup></span><sup>, in which users
+  "color:#777;padding-left:.1em;">2</a></em></sup></span>, in which users
   were shown two unbranded apps with similar ratings that had the same
   functionality but different sets of permission requests, showed that users
   were, on average, 3 times more likely to install the app with fewer
-  permissions requests. And a similar study<span style=
+  permissions requests. And a similar study <span style=
   "font-size:.8em;color:#777"><sup><em><a href="#references" style=
-  "color:#777;padding-left:.1em;">3</a></em></sup> showed that users are 1.7
+  "color:#777;padding-left:.1em;">3</a></em></sup></span> showed that users are 1.7
   times more likely, on average, to select the application with fewer
-  permission requests.</span></sup>
+  permission requests.
 </p>
 
 <p>
-  <sup>Finally, permissions usage is not evenly distributed across apps within
+  Finally, permissions usage is not evenly distributed across apps within
   a similar category of Play apps. For example, 39.3% of arcade game apps in
   the Play store request no permissions that are surfaced to the user while
   only 1.5% of arcade games request the Phone permission group (see Figure
-  1).</sup>
+  1).
 </p>
 
 <div class="wrap">
diff --git a/docs/html/training/index.jd b/docs/html/training/index.jd
index 16658b9..7673a37 100644
--- a/docs/html/training/index.jd
+++ b/docs/html/training/index.jd
@@ -27,10 +27,10 @@
   </div>
 </div>
 
-<div style="clear:left"></div>
-</div>
+<div style="clear:left" id="classes"></div>
 
-  <div><h2 class="norule">Online video courses</h2>
+<section class="dac-section dac-small" id="latest-games"><div class="wrap">
+  <h2 class="norule">Online video courses</h2>
   <p>If you prefer to learn through interactive video training,
     check out these free courses.</p>
   <div class="resource-widget resource-flow-layout col-16"
@@ -38,5 +38,7 @@
        data-sortOrder="random"
        data-cardSizes="6x6"
        data-maxResults="24"
+       data-items-per-page="24"
        data-initial-results="6"></div>
-</div>
\ No newline at end of file
+  </div>
+</section>
\ No newline at end of file
diff --git a/docs/html/training/location/change-location-settings.jd b/docs/html/training/location/change-location-settings.jd
new file mode 100644
index 0000000..70733eb
--- /dev/null
+++ b/docs/html/training/location/change-location-settings.jd
@@ -0,0 +1,251 @@
+page.title=Changing Location Settings
+trainingnavtop=true
+@jd:body
+
+<div id="tb-wrapper">
+  <div id="tb">
+
+  <h2>This lesson teaches you how to</h2>
+  <ol>
+    <li><a href="#connect">Connect to Location Services</a></li>
+    <li><a href="#location-request">Set Up a Location Request</a></li>
+    <li><a href="#get-settings">Get Current Location Settings</a></li>
+    <li><a href="#prompt">Prompt the User to Change Location Settings</a></li>
+  </ol>
+
+  <h2>You should also read</h2>
+  <ul>
+    <li>
+      <a href="https://developers.google.com/android/guides/setup"
+      class="external-link">Setting up Google Play Services</a>
+    </li>
+    <li>
+      <a href="retrieve-current.html">Getting the Last Known Location</a>
+    </li>
+   </ul>
+  </div>
+</div>
+
+<p>If your app needs to request location or receive permission updates, the
+  device needs to enable the appropriate system settings, such as GPS or Wi-Fi
+  scanning. Rather than directly enabling services such as the device's GPS,
+  your app specifies the required level of accuracy/power consumption and
+  desired update interval, and the device automatically makes the appropriate
+  changes to system settings. These settings are defined by the
+  <a href="https://developers.google.com/android/reference/com/google/android/gms/location/LocationRequest"
+  class="external-link">{@code LocationRequest}</a>
+  data object. </p>
+
+<p>This lesson shows you how to use the
+  <a href="https://developers.google.com/android/reference/com/google/android/gms/location/SettingsApi">Settings API</a>
+  to check which settings are enabled, and present the Location Settings
+  dialog for the user to update their settings with a single tap.</p>
+
+<h2 id="connect">Connect to Location Services</h2>
+
+<p>In order to use the location services provided by Google Play Services and
+  the fused location provider, connect your app using the
+  <a href="{@docRoot}reference/com/google/android/gms/common/api/GoogleApiClient">Google API Client</a>,
+  then check the current location settings and prompt the user to enable the
+  required settings if needed. For details on connecting with the
+  Google API client, see <a href="retrieve-current.html">Getting the Last Known Location</a>.</p>
+
+<p>Apps that use location services must request location permissions. For this
+  lesson, coarse location detection is sufficient. Request this permission
+  with the <code>uses-permission</code> element in your app manifest, as shown
+  in the following example:</p>
+
+<pre><code>&lt;manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.google.android.gms.location.sample.locationupdates" &gt;
+
+  &lt;uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/&gt;
+&lt;/manifest&gt;
+</code></pre>
+
+<p>If the device is running Android 6.0 or higher, and your app's target
+  SDK is 23 or higher, the app has to list the permissions in the manifest
+  <em>and</em> request those permissions at run time. For more information, see
+<a href="{@docRoot}training/permissions/requesting.html">Requesting Permissions at Run Time</a>.</p>
+
+<h2 id="location-request">Set Up a Location Request</h2>
+
+<p>To store parameters for requests to the fused location provider, create a
+  <a href="https://developers.google.com/android/reference/com/google/android/gms/location/LocationRequest.html">{@code LocationRequest}</a>.
+  The parameters determine the level of accuracy for location requests. For
+  details of all available location request options, see the
+  <a href="https://developers.google.com/android/reference/com/google/android/gms/location/LocationRequest.html">{@code LocationRequest}</a>
+  class reference. This lesson sets the update interval, fastest update
+  interval, and priority, as described below:</p>
+
+<dl>
+  <dt>
+    Update interval
+  </dt>
+  <dd>
+    <a href="https://developers.google.com/android/reference/com/google/android/gms/location/LocationRequest.html#setInterval(long)">{@code setInterval()}</a>
+    - This method sets the rate in milliseconds at which your app prefers to
+    receive location updates. Note that the location updates may be faster than
+    this rate if another app is receiving updates at a faster rate, or slower
+    than this rate, or there may be no updates at all (if the device has no
+    connectivity, for example).
+  </dd>
+  <dt>
+    Fastest update interval
+  </dt>
+  <dd>
+    <a href="https://developers.google.com/android/reference/com/google/android/gms/location/LocationRequest.html#setFastestInterval(long)">{@code setFastestInterval()}</a>
+    - This method sets the <strong>fastest</strong> rate in milliseconds at which
+    your app can handle location updates. You need to set this rate because
+    other apps also affect the rate at which updates are sent. The Google Play
+    services location APIs send out updates at the fastest rate that any app
+    has requested with
+    <a href="https://developers.google.com/android/reference/com/google/android/gms/location/LocationRequest.html#setInterval(long)">{@code setInterval()}</a>.
+    If this rate is faster
+    than your app can handle, you may encounter problems with UI flicker or data
+    overflow. To prevent this, call
+    <a href="https://developers.google.com/android/reference/com/google/android/gms/location/LocationRequest.html#setFastestInterval(long)">{@code setFastestInterval()}</a>
+    to set an upper limit to the update rate.
+  </dd>
+  <dt>Priority</dt>
+  <dd>
+    <p>
+      <a href="https://developers.google.com/android/reference/com/google/android/gms/location/LocationRequest.html#setPriority(int)">{@code setPriority()}</a>
+      - This method sets the priority of the request, which gives the Google Play
+      services location services a strong hint about which location sources to use.
+      The following values are supported:</p>
+      <ul>
+        <li>
+          <a href="https://developers.google.com/android/reference/com/google/android/gms/location/LocationRequest.html#PRIORITY_BALANCED_POWER_ACCURACY">{@code PRIORITY_BALANCED_POWER_ACCURACY}</a>
+          - Use this setting to request location precision to within a city
+          block, which is an accuracy of approximately 100 meters. This is
+          considered a coarse level of accuracy, and is likely to consume less
+          power. With this setting, the location services are likely to use WiFi
+          and cell tower positioning. Note, however, that the choice of location
+          provider depends on many other factors, such as which sources are
+          available.</li>
+        <li>
+          <a href="https://developers.google.com/android/reference/com/google/android/gms/location/LocationRequest.html#PRIORITY_HIGH_ACCURACY">{@code PRIORITY_HIGH_ACCURACY}</a>
+          - Use this setting to request the most precise location possible. With
+          this setting, the location services are more likely to use GPS
+          to determine the location.</li>
+        <li><a href="https://developers.google.com/android/reference/com/google/android/gms/location/LocationRequest.html#PRIORITY_LOW_POWER">{@code PRIORITY_LOW_POWER}</a>
+          - Use this setting to request city-level precision, which is
+          an accuracy of approximately 10 kilometers. This is considered a
+          coarse level of accuracy, and is likely to consume less power.</li>
+        <li><a href="https://developers.google.com/android/reference/com/google/android/gms/location/LocationRequest.html#PRIORITY_NO_POWER">{@code PRIORITY_NO_POWER}</a>
+          - Use this setting if you need negligible impact on power consumption,
+          but want to receive location updates when available. With this
+          setting, your app does not trigger any location updates, but
+          receives locations triggered by other apps.</li>
+      </ul>
+  </dd>
+</dl>
+
+<p>Create the location request and set the parameters as shown in this
+  code sample:</p>
+
+<pre>
+protected void createLocationRequest() {
+    LocationRequest mLocationRequest = new LocationRequest();
+    mLocationRequest.setInterval(10000);
+    mLocationRequest.setFastestInterval(5000);
+    mLocationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
+}
+</pre>
+
+<p>The priority of
+  <a href="{@docRoot}reference/com/google/android/gms/location/LocationRequest.html#PRIORITY_HIGH_ACCURACY">{@code PRIORITY_HIGH_ACCURACY}</a>,
+  combined with the
+  {@link android.Manifest.permission#ACCESS_FINE_LOCATION ACCESS_FINE_LOCATION}
+  permission setting that you've defined in the app manifest, and a fast update
+  interval of 5000 milliseconds (5 seconds), causes the fused location
+  provider to return location updates that are accurate to within a few feet.
+  This approach is appropriate for mapping apps that display the location in
+  real time.</p>
+
+<p class="note"><strong>Performance hint:</strong> If your app accesses the
+  network or does other long-running work after receiving a location update,
+  adjust the fastest interval to a slower value. This adjustment prevents your
+  app from receiving updates it can't use. Once the long-running work is done,
+  set the fastest interval back to a fast value.</p>
+
+<h2 id="get-settings">Get Current Location Settings</h2>
+
+<p>Once you have connected to Google Play services and the location services
+    API, you can get the current location settings of a user's device. To do
+    this, create a
+    <a href="{@docRoot}reference/com/google/android/gms/location/LocationSettingsRequest.Builder"><code>LocationSettingsRequest.Builder</code></a>,
+    and add one or more location requests. The following code snippet shows how
+    to add the location request that was created in the previous step:</p>
+
+<pre>LocationSettingsRequest.Builder builder = new LocationSettingsRequest.Builder()
+     .addLocationRequest(mLocationRequest);
+</pre>
+
+<p>Next check whether the current location settings are satisfied:</p>
+
+<pre>PendingResult&lt;LocationSettingsResult&gt; result =
+         LocationServices.SettingsApi.checkLocationSettings(mGoogleClient,
+                 builder.build());</pre>
+
+<p>When the <a href="{@docRoot}reference/com/google/android/gms/common/api/PendingResult"><code>PendingResult</code></a>
+  returns, your app can check the location settings by looking at the status
+  code from the <a href="{@docRoot}reference/com/google/android/gms/location/LocationSettingsResult"><code>LocationSettingsResult</code></a>
+  object. To get even more details about the the current state of the relevant
+  location settings, your app can call the
+  <a href="{@docRoot}reference/com/google/android/gms/location/LocationSettingsResult">{@code LocationSettingsResult}</a>
+  object's
+  <a href="{@docRoot}reference/com/google/android/gms/location/LocationSettingsResult#getLocationSettingsStates"><code>getLocationSettingsStates()</code></a>
+  method.</p>
+
+<h2 id="prompt">Prompt the User to Change Location Settings</h2>
+
+<p>To determine whether the location settings are appropriate for the location
+  request, check the status code from the
+  <a href="{@docRoot}reference/com/google/android/gms/location/LocationSettingsResult">{@code LocationSettingsResult}</a>
+  object. A status code of <code>RESOLUTION_REQUIRED</code> indicates that the
+  settings must be changed. To prompt the user for permission to modify the
+  location settings, call
+  <a href="{@docRoot}reference/com/google/android/gms/common/api/Status#startResolutionForResult(android.app.Activity, int)">
+            {@code startResolutionForResult(Activity, int)}</a>.
+  This method brings up a dialog asking for the user's permission to modify
+  location settings. The following code snippet shows how to check the location
+  settings, and how to call {@code startResolutionForResult(Activity, int)}.
+</p>
+
+<pre>result.setResultCallback(new ResultCallback&lt;LocationSettingsResult&gt;()) {
+     &#64;Override
+     public void onResult(LocationSettingsResult result) {
+         final Status status = result.getStatus();
+         final LocationSettingsStates = result.getLocationSettingsStates();
+         switch (status.getStatusCode()) {
+             case LocationSettingsStatusCodes.SUCCESS:
+                 // All location settings are satisfied. The client can
+                 // initialize location requests here.
+                 ...
+                 break;
+             case LocationSettingsStatusCodes.RESOLUTION_REQUIRED:
+                 // Location settings are not satisfied, but this can be fixed
+                 // by showing the user a dialog.
+                 try {
+                     // Show the dialog by calling startResolutionForResult(),
+                     // and check the result in onActivityResult().
+                     status.startResolutionForResult(
+                         OuterClass.this,
+                         REQUEST_CHECK_SETTINGS);
+                 } catch (SendIntentException e) {
+                     // Ignore the error.
+                 }
+                 break;
+             case LocationSettingsStatusCodes.SETTINGS_CHANGE_UNAVAILABLE:
+                 // Location settings are not satisfied. However, we have no way
+                 // to fix the settings so we won't show the dialog.
+                 ...
+                 break;
+         }
+     }
+ });</pre>
+
+  <p>The next lesson,
+    <a href="receive-location-updates.html">Receiving Location Updates</a>, shows
+    you how to receive periodic location updates.</p>
diff --git a/docs/html/training/location/index.jd b/docs/html/training/location/index.jd
index 8ed2071..dd6825c 100644
--- a/docs/html/training/location/index.jd
+++ b/docs/html/training/location/index.jd
@@ -79,6 +79,10 @@
      Learn how to retrieve the last known location of an Android device, which
      is usually equivalent to the user's current location.
   </dd> <dt>
+    <b><a href="change-location-settings.html">Changing Location Settings</a></b>
+  <dt> <dd>
+    Learn how to detect and apply system settings for location features.
+  </dd> <dt>
     <b><a href="receive-location-updates.html">Receiving Location
     Updates</a></b>
   </dt> <dd>
diff --git a/docs/html/training/location/receive-location-updates.jd b/docs/html/training/location/receive-location-updates.jd
index 208dc17..d82905f 100644
--- a/docs/html/training/location/receive-location-updates.jd
+++ b/docs/html/training/location/receive-location-updates.jd
@@ -7,8 +7,7 @@
 
   <h2>This lesson teaches you how to</h2>
   <ol>
-    <li><a href="#connect">Connect to Location Services</a></li>
-    <li><a href="#location-request">Set Up a Location Request</a></li>
+    <li><a href="#get-last-location">Get the Last Known Location</a></li>
     <li><a href="#updates">Request Location Updates</a></li>
     <li><a href="#callback">Define the Location Update Callback</a></li>
     <li><a href="#stop-updates">Stop Location Updates</a></li>
@@ -19,7 +18,7 @@
   <ul>
     <li>
       <a href="{@docRoot}google/play-services/setup.html">Setting up Google Play
-      Services</a>
+    Services</a>
     </li>
     <li>
       <a href="retrieve-current.html">Getting the Last Known Location</a>
@@ -64,16 +63,7 @@
   <a href="{@docRoot}reference/com/google/android/gms/location/FusedLocationProviderApi.html#requestLocationUpdates(com.google.android.gms.common.api.GoogleApiClient, com.google.android.gms.location.LocationRequest, com.google.android.gms.location.LocationListener)">{@code requestLocationUpdates()}</a>
   method in the fused location provider.
 
-<h2 id="connect">Connect to Location Services</h2>
-
-<p>Location services for apps are provided through Google Play services and the
-  fused location provider. In order to use these services, you connect your app
-  using the Google API Client and then request location updates. For details on
-  connecting with the
-  <a href="{@docRoot}reference/com/google/android/gms/common/api/GoogleApiClient.html">{@code GoogleApiClient}</a>,
-  follow the instructions in
-  <a href="retrieve-current.html">Getting the Last Known Location</a>, including
-  requesting the current location.</p>
+<h2 id="get-last-location">Get the Last Known Location</h2>
 
 <p>The last known location of the device provides a handy base from which to
   start, ensuring that the app has a known location before starting the
@@ -101,112 +91,13 @@
 &lt;/manifest&gt;
 </pre>
 
-<h2 id="location-request">Set Up a Location Request</h2>
-
-<p>To store parameters for requests to the fused location provider, create a
-  <a href="{@docRoot}reference/com/google/android/gms/location/LocationRequest.html">{@code LocationRequest}</a>.
-  The parameters determine the levels of accuracy requested. For details of all
-  the options available in the location request, see the
-  <a href="{@docRoot}reference/com/google/android/gms/location/LocationRequest.html">{@code LocationRequest}</a>
-  class reference. This lesson sets the update interval, fastest update
-  interval, and priority, as described below:</p>
-
-<dl>
-  <dt>
-    Update interval
-  </dt>
-  <dd>
-    <a href="{@docRoot}reference/com/google/android/gms/location/LocationRequest.html#setInterval(long)">{@code setInterval()}</a>
-    - This method sets the rate in milliseconds at which your app prefers to
-    receive location updates. Note that the location updates may be faster than
-    this rate if another app is receiving updates at a faster rate, or slower
-    than this rate, or there may be no updates at all (if the device has no
-    connectivity, for example).
-  </dd>
-  <dt>
-    Fastest update interval
-  </dt>
-  <dd>
-    <a href="{@docRoot}reference/com/google/android/gms/location/LocationRequest.html#setFastestInterval(long)">{@code setFastestInterval()}</a>
-    - This method sets the <strong>fastest</strong> rate in milliseconds at which
-    your app can handle location updates. You need to set this rate because
-    other apps also affect the rate at which updates are sent. The Google Play
-    services location APIs send out updates at the fastest rate that any app
-    has requested with
-    <a href="{@docRoot}reference/com/google/android/gms/location/LocationRequest.html#setInterval(long)">{@code setInterval()}</a>.
-    If this rate is faster
-    than your app can handle, you may encounter problems with UI flicker or data
-    overflow. To prevent this, call
-    <a href="{@docRoot}reference/com/google/android/gms/location/LocationRequest.html#setFastestInterval(long)">{@code setFastestInterval()}</a>
-    to set an upper limit to the update rate.
-  </dd>
-  <dt>Priority</dt>
-  <dd>
-    <p>
-      <a href="{@docRoot}reference/com/google/android/gms/location/LocationRequest.html#setPriority(int)">{@code setPriority()}</a>
-      - This method sets the priority of the request, which gives the Google Play
-      services location services a strong hint about which location sources to use.
-      The following values are supported:</p>
-      <ul>
-        <li>
-          <a href="{@docRoot}reference/com/google/android/gms/location/LocationRequest.html#PRIORITY_BALANCED_POWER_ACCURACY">{@code PRIORITY_BALANCED_POWER_ACCURACY}</a>
-          - Use this setting to request location precision to within a city
-          block, which is an accuracy of approximately 100 meters. This is
-          considered a coarse level of accuracy, and is likely to consume less
-          power. With this setting, the location services are likely to use WiFi
-          and cell tower positioning. Note, however, that the choice of location
-          provider depends on many other factors, such as which sources are
-          available.</li>
-        <li>
-          <a href="{@docRoot}reference/com/google/android/gms/location/LocationRequest.html#PRIORITY_HIGH_ACCURACY">{@code PRIORITY_HIGH_ACCURACY}</a>
-          - Use this setting to request the most precise location possible. With
-          this setting, the location services are more likely to use GPS
-          (Global Positioning System) to determine the location.</li>
-        <li><a href="{@docRoot}reference/com/google/android/gms/location/LocationRequest.html#PRIORITY_LOW_POWER">{@code PRIORITY_LOW_POWER}</a>
-          - Use this setting to request city-level precision, which is
-          an accuracy of approximately 10 kilometers. This is considered a
-          coarse level of accuracy, and is likely to consume less power.</li>
-        <li><a href="{@docRoot}reference/com/google/android/gms/location/LocationRequest.html#PRIORITY_NO_POWER">{@code PRIORITY_NO_POWER}</a>
-          - Use this setting if you need negligible impact on power consumption,
-          but want to receive location updates when available. With this
-          setting, your app does not trigger any location updates, but
-          receives locations triggered by other apps.</li>
-      </ul>
-  </dd>
-</dl>
-
-<p>Create the location request and set the parameters as shown in this
-  code sample:</p>
-
-<pre>
-protected void createLocationRequest() {
-    LocationRequest mLocationRequest = new LocationRequest();
-    mLocationRequest.setInterval(10000);
-    mLocationRequest.setFastestInterval(5000);
-    mLocationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
-}
-</pre>
-
-<p>The priority of
-  <a href="{@docRoot}reference/com/google/android/gms/location/LocationRequest.html#PRIORITY_HIGH_ACCURACY">{@code PRIORITY_HIGH_ACCURACY}</a>,
-  combined with the
-  {@link android.Manifest.permission#ACCESS_FINE_LOCATION ACCESS_FINE_LOCATION}
-  permission setting that you've defined in the app manifest, and a fast update
-  interval of 5000 milliseconds (5 seconds), causes the fused location
-  provider to return location updates that are accurate to within a few feet.
-  This approach is appropriate for mapping apps that display the location in
-  real time.</p>
-
-<p class="note"><strong>Performance hint:</strong> If your app accesses the
-  network or does other long-running work after receiving a location update,
-  adjust the fastest interval to a slower value. This adjustment prevents your
-  app from receiving updates it can't use. Once the long-running work is done,
-  set the fastest interval back to a fast value.</p>
-
 <h2 id="updates">Request Location Updates</h2>
 
-<p>Now that you've set up a location request containing your app's requirements
-  for the location updates, you can start the regular updates by calling
+<p>Before requesting location updates, your app must connect to location
+  services and make a location request. The lesson on
+  <a href="change-location-settings.html">Changing Location Settings</a>
+  shows you how to do this. Once a location request is in place you can start
+  the regular updates by calling
   <a href="{@docRoot}reference/com/google/android/gms/location/FusedLocationProviderApi.html#requestLocationUpdates(com.google.android.gms.common.api.GoogleApiClient, com.google.android.gms.location.LocationRequest, com.google.android.gms.location.LocationListener)">{@code requestLocationUpdates()}</a>.
   Do this in the
   <a href="{@docRoot}reference/com/google/android/gms/common/api/GoogleApiClient.ConnectionCallbacks.html#onConnected(android.os.Bundle)">{@code onConnected()}</a>
diff --git a/docs/html/training/location/retrieve-current.jd b/docs/html/training/location/retrieve-current.jd
index 206345f..c49b666 100644
--- a/docs/html/training/location/retrieve-current.jd
+++ b/docs/html/training/location/retrieve-current.jd
@@ -77,7 +77,7 @@
 <pre>
 &lt;manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.gms.location.sample.basiclocationsample" &gt;
-  
+
   &lt;uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/&gt;
 &lt;/manifest&gt;
 </pre>
@@ -180,5 +180,6 @@
   when the location is not available.</p>
 
 <p>The next lesson,
-  <a href="receive-location-updates.html">Receiving Location Updates</a>, shows
-  you how to receive periodic location updates.</p>
+  <a href="change-location-settings.html">Changing Location Settings</a>, shows
+  you how to detect the current location settings, and prompt the user to
+  change settings as appropriate for your app's requirements.</p>
diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs
index b03019a..9dbbe24 100644
--- a/docs/html/training/training_toc.cs
+++ b/docs/html/training/training_toc.cs
@@ -62,7 +62,6 @@
       <li class="nav-section">
         <div class="nav-section-header">
           <a href="<?cs var:toroot ?>training/basics/activity-lifecycle/index.html"
-             es-lang=""
              ja-lang="アクティビティのライフサイクル 管理"
              ko-lang="액티비티 수명 주기 관리하기"
              pt-br-lang="Como gerenciar o ciclo de vida da atividade"
@@ -76,7 +75,6 @@
         </div>
         <ul>
           <li><a href="<?cs var:toroot ?>training/basics/activity-lifecycle/starting.html"
-             es-lang=""
              ja-lang="アクティビティを開始する"
              ko-lang="액티비티 시작하기"
              pt-br-lang="Iniciando uma atividade"
@@ -87,18 +85,10 @@
           </a>
           </li>
           <li><a href="<?cs var:toroot ?>training/basics/activity-lifecycle/pausing.html"
-             es-lang=""
-             ja-lang=""
-             ko-lang=""
-             pt-br-lang=""
-             ru-lang=""
-             zh-cn-lang=""
-             zh-tw-lang="">
             Pausing and Resuming an Activity
           </a>
           </li>
           <li><a href="<?cs var:toroot ?>training/basics/activity-lifecycle/stopping.html"
-             es-lang=""
              ja-lang="アクティビティの一時停止と再開"
              ko-lang="액티비티 일시정지 및 재개하기"
              pt-br-lang="Pausando e reiniciando uma atividade"
@@ -109,7 +99,6 @@
           </a>
           </li>
           <li><a href="<?cs var:toroot ?>training/basics/activity-lifecycle/recreating.html"
-             es-lang=""
              ja-lang="アクティビティを再作成する"
              ko-lang="액티비티 재생성하기"
              pt-br-lang="Recriando uma atividade"
@@ -150,7 +139,6 @@
 
       <li class="nav-section">
         <div class="nav-section-header"><a href="<?cs var:toroot?>training/basics/data-storage/index.html"
-             es-lang=""
              ja-lang="データの保存"
              ko-lang="데이터 저장하기"
              pt-br-lang="Salvando dados"
@@ -164,7 +152,6 @@
         </div>
         <ul>
           <li><a href="<?cs var:toroot ?>training/basics/data-storage/shared-preferences.html"
-             es-lang=""
              ja-lang="キー値セットを保存する"
              ko-lang="키-값 세트 저장하기"
              pt-br-lang="Salvando conjuntos de valor-chave"
@@ -175,7 +162,6 @@
           </a>
           </li>
           <li><a href="<?cs var:toroot ?>training/basics/data-storage/files.html"
-             es-lang=""
              ja-lang="ファイルを保存する"
              ko-lang="파일 저장하기"
              pt-br-lang="Salvando arquivos"
@@ -186,7 +172,6 @@
           </a>
           </li>
           <li><a href="<?cs var:toroot ?>training/basics/data-storage/databases.html"
-             es-lang=""
              ja-lang="SQL データベースにデータを保存する"
              ko-lang="SQL 데이터베이스에 데이터 저장하기"
              pt-br-lang="Salvando dados em bancos de dados do SQL"
@@ -202,7 +187,6 @@
       <li class="nav-section">
         <div class="nav-section-header">
           <a href="<?cs var:toroot ?>training/basics/intents/index.html"
-             es-lang=""
              ja-lang="他のアプリとの相互操作"
              ko-lang="액티비티 수명 주기 관리하기"
              pt-br-lang="Interagindo com outros aplicativos"
@@ -217,7 +201,6 @@
         </div>
         <ul>
           <li><a href="<?cs var:toroot ?>training/basics/intents/sending.html"
-             es-lang=""
              ja-lang="別のアプリにユーザーを送る"
              ko-lang="다른 앱으로 사용자 보내기"
              pt-br-lang="Enviando o usuário para outro aplicativo"
@@ -228,7 +211,6 @@
           </a>
           </li>
           <li><a href="<?cs var:toroot ?>training/basics/intents/result.html"
-             es-lang=""
              ja-lang="アクティビティから結果を取得する"
              ko-lang="액티비티로부터 결과 가져오기"
              pt-br-lang="Obtendo resultados de uma atividade"
@@ -239,7 +221,6 @@
           </a>
           </li>
           <li><a href="<?cs var:toroot ?>training/basics/intents/filters.html"
-             es-lang=""
              ja-lang="他のアプリからのアクティビティの開始を許可する"
              ko-lang="다른 앱이 자신의 액티비티를 시작하도록 허용하기"
              pt-br-lang="Permitindo que outros aplicativos iniciem sua atividade"
@@ -780,6 +761,11 @@
             </a>
           </li>
           <li>
+            <a href="<?cs var:toroot ?>training/location/change-location-settings.html">
+            Changing Location Settings
+            </a>
+          </li>
+          <li>
             <a href="<?cs var:toroot ?>training/location/receive-location-updates.html">
             Receiving Location Updates
             </a>
diff --git a/docs/html/tv/index.jd b/docs/html/tv/index.jd
index 73b3435..53948ff 100644
--- a/docs/html/tv/index.jd
+++ b/docs/html/tv/index.jd
@@ -260,24 +260,6 @@
 
     </div> <!-- end .landing-rest-of-page -->
 
-    <div class="content-footer wrap" itemscope="" itemtype="http://schema.org/SiteNavigationElement">
-      <div class="layout-content-col col-16" style="padding-top:4px">
-        <style>#___plusone_0 {float:right !important;}</style>
-        <div class="g-plusone" data-size="medium"></div>
-      </div>
-    </div>
-    <div id="footer" class="wrap" style="width:940px;position:relative;top:-35px;z-index:-1">
-      <div id="copyright">
-        Except as noted, this content is
-        licensed under <a href="http://creativecommons.org/licenses/by/2.5/">
-        Creative Commons Attribution 2.5</a>. For details and
-        restrictions, see the <a href="/license.html">Content
-        License</a>.
-      </div>
-    </div>
-
-  </div> <!-- end .landing-hero-container -->
-
   <script>
   $("a.landing-down-arrow").on("click", function(e) {
     $("body").animate({
diff --git a/docs/html/wear/images/partners/casio.png b/docs/html/wear/images/partners/casio.png
new file mode 100644
index 0000000..41f36d8
--- /dev/null
+++ b/docs/html/wear/images/partners/casio.png
Binary files differ
diff --git a/docs/html/wear/images/partners/mobvoi.png b/docs/html/wear/images/partners/mobvoi.png
new file mode 100644
index 0000000..9a2eb4d
--- /dev/null
+++ b/docs/html/wear/images/partners/mobvoi.png
Binary files differ
diff --git a/docs/html/wear/images/partners/nb.png b/docs/html/wear/images/partners/nb.png
new file mode 100644
index 0000000..224b27e
--- /dev/null
+++ b/docs/html/wear/images/partners/nb.png
Binary files differ
diff --git a/docs/html/wear/index.jd b/docs/html/wear/index.jd
index e18ada4..618fb30 100644
--- a/docs/html/wear/index.jd
+++ b/docs/html/wear/index.jd
@@ -213,6 +213,9 @@
             <div class="col-4">
               <img src="/wear/images/partners/broadcom.png" alt="Broadcom">
             </div>
+             <div class="col-4">
+              <img src="/wear/images/partners/casio.png" alt="Casio">
+            </div>
             <div class="col-4">
               <img src="/wear/images/partners/fossil.png" alt="Fossil">
             </div>
@@ -234,9 +237,15 @@
             <div class="col-4">
               <img src="/wear/images/partners/mips.png" alt="MIPS">
             </div>
+             <div class="col-4">
+              <img src="/wear/images/partners/mobvoi.png" alt="Mobvoi">
+            </div>
             <div class="col-4">
               <img src="/wear/images/partners/motorola.png" alt="Motorola">
             </div>
+             <div class="col-4">
+              <img src="/wear/images/partners/nb.png" alt="New Balance">
+            </div>
             <div class="col-4">
               <img src="/wear/images/partners/qualcomm.png" alt="Qualcomm">
             </div>
@@ -249,6 +258,7 @@
             <div class="col-4">
               <img src="/wear/images/partners/tagheuer.png" alt="Tag Heuer">
             </div>
+
           </div>
         </div> <!-- end .wrap -->
       </div>
@@ -332,22 +342,6 @@
         </div> <!-- end .wrap -->
       </div> <!-- end .landing-section -->
     </div> <!-- end .landing-rest-of-page -->
-    <div class="content-footer wrap" itemscope="" itemtype="http://schema.org/SiteNavigationElement">
-      <div class="layout-content-col col-16" style="padding-top:4px">
-        <style>#___plusone_0 {float:right !important;}</style>
-        <div class="g-plusone" data-size="medium"></div>
-      </div>
-    </div>
-    <div id="footer" class="wrap" style="width:940px;position:relative;top:-35px;z-index:-1">
-      <div id="copyright">
-        Except as noted, this content is
-        licensed under <a href="http://creativecommons.org/licenses/by/2.5/">
-        Creative Commons Attribution 2.5</a>. For details and
-        restrictions, see the <a href="{@docRoot}license.html">Content
-        License</a>.
-      </div>
-    </div>
-  </div> <!-- end .landing-hero-container -->
 
   <script>
   $("a.landing-down-arrow").on("click", function(e) {