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_