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