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
Merge pull request #888 from gesa/1040133/mwc-color-regression

Fixes Bug 1040133 - Wrong text color on made w. code page
Small edit to fix url for CSS Diner
Merge pull request #891 from keyboardkat/patch-15

Fixes Bug 1040956 - Fix url for CSS Diner on "Composing" Web Lit page