am 1ef0d363: am 285f0772: Merge "clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav" into jb-mr2-docs

* commit '1ef0d36382388e51d011d2dd481d11750a4a858a':
  clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav