Bug 1038163 - Remove second 'Tools' link in subnav
Bug 1029720 - Sign up text in footer should not be grey
Update content.json

Edit summary, all under "Explore" section of "Search":
* Removed "What is the world searching for?" [DUPLICATE] and added "today" to "What is the world searching for today?" 
* Also removed "Don't want your searches to be tracked?" [also DUPLICATE]. 
* Added section "Have you explored search engines other than Google?"
* Added "exactly" to "How does search work, exactly" to delineate between section preceding it.
Merge pull request #878 from keyboardkat/patch-12

Fixes Bug 1024831 - Add more info on alternative search engines to Search resources page
used tag search for more appmaker makes
Bug 1039538 - Fix make ID rendering regression on the /me page
bug1029716 - Add footer to /tools page
Bug 1029787 Keep profile information in sticky nav
replaced playUrl with appUrl in appmaker landing page
Merge pull request #882 from secretrobotron/appmaker-search-fix

used tag search for more appmaker makes
Merge pull request #884 from secretrobotron/appmaker-play-url-fix

replaced playUrl with appUrl in appmaker landing page
Bug 1039615 - Forward webmaker.org/makerparty to Maker Party site
Adding City field for hive community badge
Fixes Bug 1040133 - Wrong text color on made w. code page
Fixed Bug 1014765 - updated font-awesome to 4.1.0
Fixed Bug 1019640
Fixed Bug 1019640
Merge pull request #887 from christensenep/1025130

Bug 1025130 - Add field specifying Hive city for Hive Community badge
Added `| safe` filter after the gettext

Added `| safe` filter after the gettext to prevent the HTML from being escaped.
Merge pull request #890 from tanay1337/master

Fixed Bug 1014765 & Bug 1019640