Bug 1056585 - List of skills and competencies not showing at
webmaker.org/literacy
 Bug 1034371 - Resources Competencies: create a content gen directive for discover/make
Merge pull request #961 from gesa/1056585/missing-literacy-skills

Fixes Bug 1056585 - List of skills and competencies not showing at webmaker.org/literacy
Merge pull request #960 from gesa/1034371/make-media

Fixes Bug 1034371 - Resources Competencies: create a content gen directive for discover/make