[fix bug 918687] Display voucher in user profile.
[fix bug 928959] Convert image to RGB before saving as JPEG.
A few doc fixes

* Correct the command to run the tests
* Fix the numbering of the steps in the install virtualenv page
* Break out the last few instructions into steps of their own
* Fix a comma
Bug 929718 - Fix duplicate countries and cities in API

Because the custom manager that implements field-specific privacy
requires us to include privacy_country or privacy_city in the values()
part of the query, there's not a good way to fix this in the
query itself.

Added some code that fixes up the result list after the query
to collapse the duplicates down again and add up the population.
Merge pull request #676 from glogiotatidis/928959

[fix bug 928959] Convert image to RGB before saving as JPEG.
[fix bug 928936] Return invalid date string when date_mozillians does not validate.
Merge pull request #675 from glogiotatidis/928936

[fix bug 928936] Return invalid date string when date_mozillians does not validate.
[Bug 913382] Fix browserid logo link
[fix bug 908667] Add pagination in country listing pages.
Merge pull request #683 from glogiotatidis/gh-662

[fix bug 908667] Add pagination in country listing pages.
Merge pull request #680 from dpoirier/doc-tweaks2

A few doc fixes
[Bug 913382] fix admin static url
[Fix bug 928814] Fixes the missing icons with mozillian.org user profile page
Merge pull request #690 from anushbmx/patch-1

Fixes missing icons
Revert "fix middleware classes"

This reverts commit 7a60f96f904892e1e185382c950201e20b67e507.
Revert "fix INSTALLED_APPS"

This reverts commit 00031709b39ad647a5476c4d770c273c5f9d56c3.

Conflicts:
	mozillians/settings/base.py
[fix bug 689167] Re-enable CSP.
[Fix Bug 845799] Removed the IRC link from the profile and group pages. IRC name is still visible, it just doesn't link to anything anymore.
Merge pull request #691 from ggladden/first_bug_fix

Removed the IRC link from the profile page. IRC name is still visible, i...
Merge pull request #645 from glogiotatidis/csp-again

Csp again