[fix bug 918687] Display voucher in user profile.
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.
[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
Respect UserProfile privacy settings of vouched_by obj.

Populate UserProfile.vouched_by when vouched_by UserProfile object has
at least one attribute with privacy level same or higher as the requests
vouchee object.
Merge pull request #673 from glogiotatidis/gh-668

Display voucher in user profile
Use MySQL in development

sqlite3's behavior differs enough from MySQL's that it's not a good idea
to use sqlite3 for backend development, since what works in your development
environment might then not work on the real servers using MySQL.

Update the documentation and sample settings file to use MySQL.
[fix bug 930571] Switch to django-compressor.

* Switch from jingo-minify to django-compressor
* Add django-jingo-offline-compressor
* Update jenkins
* Update local.py dists
* Update Chief command
* Delete unused qunit files and related libs.
Mention that some OS distributions provide MySQL packages
Merge pull request #692 from glogiotatidis/compressor

[fix bug 930571] Switch to django-compressor.
Merge pull request #694 from dpoirier/bug-932950-migrate-from-scratch

Bug 932950 - Use MySQL in development
[Fix Bug 913373] word wrapping on profile url
[fix bug 934518] Regression: Missing interface elements
Merge pull request #698 from fxa90id/Bug_934518

[fix bug 934518] Regression: Missing interface elements