Bug 990087 - Add link to training from webmaker.org homepage
Fixed Bug 1022638

Removed tools logos from navigation bar
Merge pull request #896 from k88hudson/990087

Bug 990087 - Add link to training from webmaker.org homepage
Fixes Bug 1032223 - GA tracking for email sign-up
Merge pull request #901 from adamlofting/bug1032223

Fixes Bug 1032223 - GA tracking for email sign-up
Fixed Bug 1022638

Made changes in this parallel file.
Fix bug 1042548 - Mozillians like you footer text
1.1.29
Fix bug 1042548 - Escaped HTML in footer
1.1.30
Merge pull request #898 from tanay1337/Bug-1022638

Fixed Bug 1022638
Fixed Bug 1032795

Included Webmaker Mentor badge in navigation
Merge pull request #903 from k88hudson/tanay

Fixed Bug 1032795
Update content.json

Added image and gif as first sample bits of media for the page.
Fixed Bug 915381
Merge pull request #906 from k88hudson/tanay-915381

Fixed Bug 915381
Update content.json

Trying to make suggested edits (altho I wasn't sure about where the last suggestion was in code. Is this right?)
Fixes Bug 1032389 - Add JSON syntax for embedded TED and Popcorn videos
Fixes Bug 1031283 - Resources footers show wrong icons
Update content.json

Line 656 fixed (I hope!)