Merge branch 'bug-763647-fennec-new' of github.com:sgarrity/bedrock into bug-763647-fennec-new
Tidy up fonts and styles for download buttons
Merge remote branch 'sgarrity-fork/bug-763645-fennec-homepage' into responsive
Revert "Revert "Merge pull request #180 from sgarrity/bug-763647-fennec-new""

This reverts commit 1e301f9bf14a6c8b2b7c811c50c67579c9e9b89a.
Merge remote branch 'sgarrity-fork/bug-763647-fennec-new' into responsive
Merge remote branch 'sgarrity-fork/bug-724070-fennec-fx' into responsive
Merge remote branch 'craigcook/bug-763650-mobile-features' into responsive
Merge remote branch 'craigcook/bug-763652-mobile-faq' into responsive

Conflicts:
	apps/firefox/templates/firefox/new.html
	media/css/firefox/new.less
	settings/base.py
Cleanup/polish from bug feedback
Fix Google Play icon
Add a base responsive template for mozorg pages, so we get the right email form
Put the android promo box first
Merge remote branch 'sgarrity-fork/bug-763645-fennec-homepage' into responsive

Conflicts:
	apps/mozorg/templates/mozorg/home.html
Fix sub-links on mobile buttons
Merge branch 'refs/heads/bug-763650-mobile-features' into responsive
Mobile overview page

Also updated navbar for Firefox pages
Optimized images
Fixed Flash version in mobile FAQ
Fixing botched merge
Responsive menu JavaScript.
Use 4 spaces instead of 2 spaces for indent in JS code.