resolve folder names conflict
Merge branch 'master' into gh-pages
change link to Checklists