[bug 903192] IE popup blocker prevents users from downloading Firefox
Fix & refactor GA video tracking on fx firstrun. Bug 908883.
Add missing UL closing tag (Bug 887426)
Fix bad spacing in nested lists
on participation polociy page (Bug 887426)
Fix indenting (whitespace) for Bug 887426
Bug 905165:  Create a helper function for link to press blog (l10n)
Fix bug 904726: Update to latest playdoh-lib.

Upgades to Django==1.4.6.
Fix test to check correct locale and make more DRY
Merge pull request #1194 from jgmize/Bug-905165_helper_function_localized_press_blogs

Bug 905165 helper function localized press blogs
Merge pull request #1196 from pmclanahan/update-playdoh-lib

Fix bug 904726: Update to latest playdoh-lib.
Bug 903886 - Expose canonical and alternate URLs on Bedrock views
Merge pull request #1175 from kyoshino/bug-903886-canonical-backend

Bug 903886 - Expose canonical and alternate URLs on Bedrock views
Merge pull request #1190 from jpetto/bug-908883-fx-firstrun-video-play-ga

Fix & refactor GA video tracking on fx firstrun. Bug 908883.
Merge pull request #1195 from sgarrity/bug-887426-spacing

Popouri of minor fixes for policies pages
[fix bug 911219] Change smartsphone to smartphone
Merge pull request #1202 from m-alexis/master

[fix bug 911219] Change smartsphone to smartphone
Bug 910894 - Cleanup pep8 violations and have jenkins run flake8

Add flake8 to requirements
Merge pull request #1176 from alexgibson/bug-903192-ie-popup-blocker-prevents-users-from-downloading-firefox

[bug 903192] IE popup blocker prevents users from downloading Firefox
at2x retina image function - refs bug 898013

Mozilla.ImageHelper class that handles detecting high-res display and also handles showing high-res images as well as handling platform images
Merge branch 'bug-898013-retina-img-tag' of github.com:nburka/bedrock into bug-898013-retina-img-tag

Conflicts:
	bedrock/mozorg/tests/test_helper_misc.py