fixes Bug 1014939 - Switch /resources/web-literacy URLs to /resource/literacy
Merge pull request #739 from gesa/1014939/rename-urls

fixes Bug 1014939 - Switch /resources/web-literacy URLs to /resource/literacy
Nobug: Fixing url nonesense for literacies, R aki_
Fixes Bug 1015010 - Creates a FontAwesome 4 shim for webmaker.org
Merge pull request #737 from gesa/1015010/fa-shim

 Bug 1015010 - Creates a FontAwesome 4 shim for webmaker/resources.
Merge pull request #740 from k88hudson/fuckup

Nobug: Fixing url nonesense for literacies, R aki_
Bug 1009000 - Add copy for new competency pages to webmaker.org
Merge branch 'master' of github.com:mozilla/webmaker.org
1.0.89
Fix bug 1010659 - Add tools to main nav
Fix bug 1010660 - Simplify tool links
Fix bug 101662 - teach-templates should redirect to make-your-own
Bug 1014432 - Update to webmaker-auth-client v0.1.2
1.0.90
lint
Bug 1015312 - Fix memory leak from nunjucks file system loader
1.0.91
Bug 1014432 - Track cancelling the create user form